diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-11-13 17:16:02 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-11-14 20:31:55 +0100 |
| commit | 1d7577d486bee2b9eb3825ab69fe85c0597570f7 (patch) | |
| tree | f9e530e2e07f1eb02db2b48d92fa007a199f3e90 /src/gui/opengl | |
| parent | ef693dcb41fa2307476d082bd0d8691a546f8a7b (diff) | |
QOpenGLTexture: move the Feature enum on top of the header
Change-Id: I08f5f3b2856edbdd8c88e65d5af75d760a39facb
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopengltexture.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/gui/opengl/qopengltexture.h b/src/gui/opengl/qopengltexture.h index a39cc18245..0f999a8409 100644 --- a/src/gui/opengl/qopengltexture.h +++ b/src/gui/opengl/qopengltexture.h @@ -330,6 +330,28 @@ public: DirectionR = 0x8072 // GL_TEXTURE_WRAP_R }; + // Features + enum Feature { + ImmutableStorage = 0x00000001, + ImmutableMultisampleStorage = 0x00000002, + TextureRectangle = 0x00000004, + TextureArrays = 0x00000008, + Texture3D = 0x00000010, + TextureMultisample = 0x00000020, + TextureBuffer = 0x00000040, + TextureCubeMapArrays = 0x00000080, + Swizzle = 0x00000100, + StencilTexturing = 0x00000200, + AnisotropicFiltering = 0x00000400, + NPOTTextures = 0x00000800, + NPOTTextureRepeat = 0x00001000, + Texture1D = 0x00002000, +#ifndef Q_QDOC + MaxFeatureFlag = 0x00004000 +#endif + }; + Q_DECLARE_FLAGS(Features, Feature) + explicit QOpenGLTexture(Target target); explicit QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps); ~QOpenGLTexture(); @@ -433,28 +455,6 @@ public: // Helpful overloads for setData void setData(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps); - // Features - enum Feature { - ImmutableStorage = 0x00000001, - ImmutableMultisampleStorage = 0x00000002, - TextureRectangle = 0x00000004, - TextureArrays = 0x00000008, - Texture3D = 0x00000010, - TextureMultisample = 0x00000020, - TextureBuffer = 0x00000040, - TextureCubeMapArrays = 0x00000080, - Swizzle = 0x00000100, - StencilTexturing = 0x00000200, - AnisotropicFiltering = 0x00000400, - NPOTTextures = 0x00000800, - NPOTTextureRepeat = 0x00001000, - Texture1D = 0x00002000, -#ifndef Q_QDOC - MaxFeatureFlag = 0x00004000 -#endif - }; - Q_DECLARE_FLAGS(Features, Feature) - static bool hasFeature(Feature feature); // Texture Parameters |