diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-08 14:26:33 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-03-10 09:53:07 (GMT) |
| commit | 4737daef1c8d7a181117d6482f5b57cfc433e050 (patch) | |
| tree | a9b2fbe71b2eee2d0e80ad11fa4e28960c10764e /src/opengl/qgl_x11.cpp | |
| parent | 79a83854bcae35c22e02212a775fcbf825c1439d (diff) | |
| download | Qt-4737daef1c8d7a181117d6482f5b57cfc433e050.zip Qt-4737daef1c8d7a181117d6482f5b57cfc433e050.tar.gz Qt-4737daef1c8d7a181117d6482f5b57cfc433e050.tar.bz2 | |
Handle EGLSurfaces better, including more error detection
Note: This changes QX11PixmapData::gl_surface to a void* to enable
build on 64-bit systems where EGLSurface is a pointer.
Reviewed-By: TrustMe
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index f0b06ef5..4fa1467 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1753,7 +1753,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData *pmd, con if (!glxPixmap) return 0; - pixmapData->gl_surface = (Qt::HANDLE)glxPixmap; + pixmapData->gl_surface = (void*)glxPixmap; // Make sure the cleanup hook gets called so we can delete the glx pixmap QImagePixmapCleanupHooks::enableCleanupHooks(pixmapData); |