summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopengltexture.h
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2014-02-05 19:49:13 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-07 18:48:14 +0100
commitbbf3d01f78460b751334cd043b34940904e06eae (patch)
tree95ff77b3c9216916756abc25d1ff01e4b08415d1 /src/gui/opengl/qopengltexture.h
parent05f7f9bc58596000406bcbbd94123bb31b3cba33 (diff)
QOpenGLTexture: fix support for 1D textures
OpenGL ES 2 doesn't support 1D textures. So introduce a proper feature flag and warn if we try to allocate one there. Change-Id: I73cf58c1f257d2472564f45bff222231e39aca52 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/gui/opengl/qopengltexture.h')
-rw-r--r--src/gui/opengl/qopengltexture.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/opengl/qopengltexture.h b/src/gui/opengl/qopengltexture.h
index bb632454ad..0c272456f6 100644
--- a/src/gui/opengl/qopengltexture.h
+++ b/src/gui/opengl/qopengltexture.h
@@ -404,8 +404,9 @@ public:
AnisotropicFiltering = 0x00000400,
NPOTTextures = 0x00000800,
NPOTTextureRepeat = 0x00001000,
+ Texture1D = 0x00002000,
#ifndef Q_QDOC
- MaxFeatureFlag = 0x00002000
+ MaxFeatureFlag = 0x00004000
#endif
};
Q_DECLARE_FLAGS(Features, Feature)