AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QOpenGLTexture: move the Feature enum on top of the header

Browse Source 
Change-Id: I08f5f3b2856edbdd8c88e65d5af75d760a39facb
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
This commit is contained in:
Giuseppe D'Angelo 2014-11-13 17:16:02 +01:00 committed by Sean Harmer
parent ef693dcb41
commit 1d7577d486
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/opengl/qopengltexture.h
View File

@ -330,6 +330,28 @@ public:
DirectionR = 0x8072 // GL_TEXTURE_WRAP_R 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(Target target);
explicit QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps); explicit QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps);
~QOpenGLTexture(); ~QOpenGLTexture();
@ -433,28 +455,6 @@ public:
// Helpful overloads for setData // Helpful overloads for setData
void setData(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps); 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); static bool hasFeature(Feature feature);
// Texture Parameters // Texture Parameters