summaryrefslogtreecommitdiffstats
path: root/src/gui/egl
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-03-05 15:59:06 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-03-05 16:31:27 (GMT)
commitee07fff45d49e69d9a4f4474861a219af8d557f2 (patch)
tree060818b8175f625ae08c1e90bb71999e40e021ab /src/gui/egl
parent4c4537d63a62d5ba0a2d8ddbc04026f81399268f (diff)
downloadQt-ee07fff45d49e69d9a4f4474861a219af8d557f2.zip
Qt-ee07fff45d49e69d9a4f4474861a219af8d557f2.tar.gz
Qt-ee07fff45d49e69d9a4f4474861a219af8d557f2.tar.bz2
Make QEgl::createSurface store the surface in the pixmapdata too
This means the same surface can then later be used to bind the pixmap as a texture using eglBindTexImage2D. Reviewed-By: TrustMe
Diffstat (limited to 'src/gui/egl')
-rw-r--r--src/gui/egl/qegl_x11.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index 483c01d..8608523 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -404,9 +404,11 @@ EGLSurface QEgl::createSurface(QPaintDevice *device, EGLConfig config, const QEg
else
surfaceAttribs.setValue(EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGB);
- return eglCreatePixmapSurface(QEgl::display(), config,
- (EGLNativePixmapType) x11PixmapData->handle(),
- surfaceAttribs.properties());
+ EGLSurface surf = eglCreatePixmapSurface(QEgl::display(), config,
+ (EGLNativePixmapType) x11PixmapData->handle(),
+ surfaceAttribs.properties());
+ x11PixmapData->gl_surface = (Qt::HANDLE)surf;
+ return surf;
}
return EGL_NO_SURFACE;