diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-17 20:10:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-17 20:10:34 +0100 |
| commit | bc4cd465dd5df82e13f3c7709166ee11289d219f (patch) | |
| tree | d6323aaed6383e589fbefb6057648c22bb187c76 /src/gui/opengl/qopenglshaderprogram.cpp | |
| parent | 43daefb0962794b2df256cae1098e889b9b36f12 (diff) | |
| parent | 07745d7bfbf6c8d83e0243150d8ce934675dea87 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
qmake/Makefile.unix
Change-Id: Ia18e391198222eef34ffa2df6f683e052058d032
Diffstat (limited to 'src/gui/opengl/qopenglshaderprogram.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglshaderprogram.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index c9552fd321e..cc8af16bfe7 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -215,10 +215,12 @@ Q_LOGGING_CATEGORY(DBG_SHADER_CACHE, "qt.opengl.diskcache") #define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE #endif +#ifndef QT_OPENGL_ES_2 static inline bool isFormatGLES(const QSurfaceFormat &f) { return (f.renderableType() == QSurfaceFormat::OpenGLES); } +#endif static inline bool supportsGeometry(const QSurfaceFormat &f) { |