diff options
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformgraphicsbufferhelper.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index a004d9e10d..9a03333537 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -206,7 +206,7 @@ int QOpenGLContextPrivate::maxTextureSize() QOpenGLFunctions *funcs = q->functions(); funcs->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size); -#ifndef QT_OPENGL_ES +#if !QT_CONFIG(opengles2) if (!q->isOpenGLES()) { GLenum proxy = GL_PROXY_TEXTURE_2D; @@ -232,7 +232,7 @@ int QOpenGLContextPrivate::maxTextureSize() max_texture_size = size; } -#endif // QT_OPENGL_ES +#endif // QT_CONFIG(opengles2) return max_texture_size; } @@ -957,7 +957,7 @@ QOpenGLContext::OpenGLModuleType QOpenGLContext::openGLModuleType() #if defined(QT_OPENGL_DYNAMIC) Q_ASSERT(qGuiApp); return QGuiApplicationPrivate::instance()->platformIntegration()->openGLModuleType(); -#elif defined(QT_OPENGL_ES_2) +#elif QT_CONFIG(opengles2) return LibGLES; #else return LibGL; diff --git a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp index c67e6d15cb..34cb7d0274 100644 --- a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp +++ b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp @@ -213,7 +213,7 @@ bool QPlatformGraphicsBufferHelper::bindSWToTexture(const QPlatformGraphicsBuffe if (rect.isNull() || rect == QRect(QPoint(0,0),size)) { funcs->glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, size.width(), size.height(), 0, GL_RGBA, pixelType, image.constBits()); } else { -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) if (!ctx->isOpenGLES()) { funcs->glPixelStorei(GL_UNPACK_ROW_LENGTH, image.width()); funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x(), rect.y(), rect.width(), rect.height(), GL_RGBA, pixelType, |