diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:18:24 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:56:41 +0200 |
commit | e6286ca289db11463d13ec4d31055995b32ad258 (patch) | |
tree | 944bd3a2e93691bdd977ef7818b8241c1193d888 /src/opengl | |
parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
parent | 9ae89313e43689483282ac330ad189db89bfcbba (diff) |
Merge remote-tracking branch 'origin/release' into stable
Manually fixed up: isES -> isOpenGLES
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index dd3b6ee2d3..5d4ca42dc2 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -224,7 +224,7 @@ void QGL2PaintEngineExPrivate::updateBrushTexture() currentBrushPixmap = currentBrushPixmap.scaled(max_texture_size, max_texture_size, Qt::KeepAspectRatio); GLuint wrapMode = GL_REPEAT; - if (ctx->contextHandle()->isES()) { + if (ctx->contextHandle()->isOpenGLES()) { // OpenGL ES does not support GL_REPEAT wrap modes for NPOT textures. So instead, // we emulate GL_REPEAT by only taking the fractional part of the texture coords // in the qopenglslTextureBrushSrcFragmentShader program. |