diff options
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 20 | ||||
| -rw-r--r-- | src/opengl/qgl_qpa.cpp | 6 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 5d2221f..0d2f2a2 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -90,10 +90,9 @@ QT_BEGIN_NAMESPACE -inline static bool isPowerOfTwo(int x) +inline static bool isPowerOfTwo(uint x) { - // Assumption: x >= 1 - return x == (x & -x); + return x && !(x & (x - 1)); } #if defined(Q_WS_WIN) @@ -248,16 +247,13 @@ void QGL2PaintEngineExPrivate::updateBrushTexture() QGLTexture *tex = ctx->d_func()->bindTexture(currentBrushPixmap, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption | QGLContext::CanFlipNativePixmapBindOption); -#if !defined(QT_NO_DEBUG) && defined(QT_OPENGL_ES_2) - QGLFunctions funcs(QGLContext::currentContext()); - bool npotSupported = funcs.hasOpenGLFeature(QGLFunctions::NPOTTextures); - bool isNpot = !isPowerOfTwo(currentBrushPixmap.size().width()) - || !isPowerOfTwo(currentBrushPixmap.size().height()); - if (isNpot && !npotSupported) { - qWarning("GL2 Paint Engine: This system does not support the REPEAT wrap mode for non-power-of-two textures."); - } + GLenum wrapMode = GL_REPEAT; +#ifdef QT_OPENGL_ES_2 + // should check for GL_OES_texture_npot or GL_IMG_texture_npot extension + if (!isPowerOfTwo(currentBrushPixmap.width()) || !isPowerOfTwo(currentBrushPixmap.height())) + wrapMode = GL_CLAMP_TO_EDGE; #endif - updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, q->state()->renderHints & QPainter::SmoothPixmapTransform); + updateTextureFilter(GL_TEXTURE_2D, wrapMode, q->state()->renderHints & QPainter::SmoothPixmapTransform); textureInvertedY = tex->options & QGLContext::InvertedYBindOption ? -1 : 1; } brushTextureDirty = false; diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 9ba8b75..518c860 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE /*! + \since 4.8 + Returns an OpenGL format for the platform window format specified by \a format. */ QGLFormat QGLFormat::fromPlatformWindowFormat(const QPlatformWindowFormat &format) @@ -87,6 +89,8 @@ QGLFormat QGLFormat::fromPlatformWindowFormat(const QPlatformWindowFormat &forma } /*! + \since 4.8 + Returns a platform window format for the OpenGL format specified by \a format. */ QPlatformWindowFormat QGLFormat::toPlatformWindowFormat(const QGLFormat &format) @@ -387,6 +391,8 @@ QGLContext::QGLContext(QPlatformGLContext *platformContext) } /*! + \since 4.8 + Returns a OpenGL context for the platform-specific OpenGL context given by \a platformContext. */ |