1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if OES_texture_npot is present on OpenGL ES 2.

Browse Source 
Unless the OES_texture_npot extension is present, non-power-
of-two textures have some restrictions on OpenGL ES 2.

Reviewed-by: Samuel
This commit is contained in:
Kim Motoyoshi Kalland 2011-05-11 10:53:00 +02:00
parent fda40e37df
commit 7fce0a73cc
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/opengl/qglfunctions.cpp
View File

@ -211,7 +211,7 @@ QGLFunctions::QGLFunctions(const QGLContext *context)
static int qt_gl_resolve_features() static int qt_gl_resolve_features()
{ {
#if defined(QT_OPENGL_ES_2) #if defined(QT_OPENGL_ES_2)
return QGLFunctions::Multitexture | int features = QGLFunctions::Multitexture |
QGLFunctions::Shaders | QGLFunctions::Shaders |
QGLFunctions::Buffers | QGLFunctions::Buffers |
QGLFunctions::Framebuffers | QGLFunctions::Framebuffers |
@ -222,8 +222,12 @@ static int qt_gl_resolve_features()
QGLFunctions::BlendSubtract | QGLFunctions::BlendSubtract |
QGLFunctions::CompressedTextures | QGLFunctions::CompressedTextures |
QGLFunctions::Multisample | QGLFunctions::Multisample |
QGLFunctions::StencilSeparate | QGLFunctions::StencilSeparate;
QGLFunctions::NPOTTextures; if (extensions.match("GL_OES_texture_npot"))
features |= QGLFunctions::NPOTTextures;
if (extensions.match("GL_IMG_texture_npot"))
features |= QGLFunctions::NPOTTextures;
return features;
#elif defined(QT_OPENGL_ES) #elif defined(QT_OPENGL_ES)
int features = QGLFunctions::Multitexture | int features = QGLFunctions::Multitexture |
QGLFunctions::Buffers | QGLFunctions::Buffers |
@ -240,6 +244,8 @@ static int qt_gl_resolve_features()
features |= QGLFunctions::BlendSubtract; features |= QGLFunctions::BlendSubtract;
if (extensions.match("GL_OES_texture_npot")) if (extensions.match("GL_OES_texture_npot"))
features |= QGLFunctions::NPOTTextures; features |= QGLFunctions::NPOTTextures;
if (extensions.match("GL_IMG_texture_npot"))
features |= QGLFunctions::NPOTTextures;
return features; return features;
#else #else
int features = 0; int features = 0;