diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-15 12:10:50 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-16 12:52:12 (GMT) |
| commit | 5480e3b68da98253ae6ec58bd0db0075225a4e22 (patch) | |
| tree | a23c222a11182edb210c9fc41a77431af1087540 /src/opengl | |
| parent | dda010b51b8e3ec6955b64290ad47c0f43dcda73 (diff) | |
| download | Qt-5480e3b68da98253ae6ec58bd0db0075225a4e22.zip Qt-5480e3b68da98253ae6ec58bd0db0075225a4e22.tar.gz Qt-5480e3b68da98253ae6ec58bd0db0075225a4e22.tar.bz2 | |
Cleanup & remove unused function overloads from QEgl* APIs
This should make stubbing out these APIs slightly easier.
Reviewed-By: TrustMe
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_egl.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/qglpixelbuffer_egl.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp index 822c9f6..0fbbbf9 100644 --- a/src/opengl/qgl_egl.cpp +++ b/src/opengl/qgl_egl.cpp @@ -147,7 +147,7 @@ void qt_glformat_from_eglconfig(QGLFormat& format, const EGLConfig config) // Clear the EGL error state because some of the above may // have errored out because the attribute is not applicable // to the surface type. Such errors don't matter. - QEgl::clearError(); + eglGetError(); } bool QGLFormat::hasOpenGL() diff --git a/src/opengl/qglpixelbuffer_egl.cpp b/src/opengl/qglpixelbuffer_egl.cpp index db9e754..0b94f5a 100644 --- a/src/opengl/qglpixelbuffer_egl.cpp +++ b/src/opengl/qglpixelbuffer_egl.cpp @@ -75,9 +75,9 @@ bool QGLPixelBufferPrivate::init(const QSize &size, const QGLFormat &f, QGLWidge ctx->setConfig(shareContext->config()); #if QGL_RENDER_TEXTURE EGLint value = EGL_FALSE; - if (ctx->configAttrib(EGL_BIND_TO_TEXTURE_RGBA, &value) && value) + if (ctx->configAttrib(EGL_BIND_TO_TEXTURE_RGBA) == EGL_TRUE) textureFormat = EGL_TEXTURE_RGBA; - else if (ctx->configAttrib(EGL_BIND_TO_TEXTURE_RGB, &value) && value) + else if (ctx->configAttrib(EGL_BIND_TO_TEXTURE_RGB) == EGL_TRUE) textureFormat = EGL_TEXTURE_RGB; #endif } else { |