summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-11-19 16:47:20 +0100
committerLaszlo Agocs <laszlo.agocs@digia.com>2014-11-19 19:00:52 +0100
commit2810d7ee10c59b0486c12744a2bdf22856bfb81e (patch)
tree38b7af9b43b6cf4a008c447421d30c0697d385d8 /src/gui/opengl
parente64188966ca192f93e2ce597e3518b81facc8b8c (diff)
Use the static TexStorage2|3D funcs in es builds
When building with -opengl es2 and having ES 3.0 or newer, TexStorage must resolve directly to the functions. Other paths (desktop, ES when using dynamic on Windows) are already covered below. Change-Id: If214578bf23547d6f66a17bc999e9fabf97ba770 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/gui/opengl')
-rw-r--r--src/gui/opengl/qopengltexturehelper.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengltexturehelper.cpp b/src/gui/opengl/qopengltexturehelper.cpp
index 29cecf0ea8..1eeab64911 100644
--- a/src/gui/opengl/qopengltexturehelper.cpp
+++ b/src/gui/opengl/qopengltexturehelper.cpp
@@ -200,8 +200,13 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
TexImage2DMultisample = 0;
// OpenGL 4.2
+#ifdef QT_OPENGL_ES_3
+ TexStorage3D = ::glTexStorage3D;
+ TexStorage2D = ::glTexStorage2D;
+#else
TexStorage3D = 0;
TexStorage2D = 0;
+#endif
TexStorage1D = 0;
// OpenGL 4.3