summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-04-07 14:38:37 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-04-07 14:38:37 (GMT)
commit2df78bfc92bdf6da1de87ae684b4c59b70767f90 (patch)
tree38f8d9c056f00019757006561a978d2b4d410062 /src
parenta7177ea6be1a7617f82edf062164083bbc2eb47a (diff)
downloadQt-2df78bfc92bdf6da1de87ae684b4c59b70767f90.zip
Qt-2df78bfc92bdf6da1de87ae684b4c59b70767f90.tar.gz
Qt-2df78bfc92bdf6da1de87ae684b4c59b70767f90.tar.bz2
Disable EGLImage usage
It's broken. It will be fixed properly.
Diffstat (limited to 'src')
-rw-r--r--src/opengl/qgl_x11egl.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/opengl/qgl_x11egl.cpp b/src/opengl/qgl_x11egl.cpp
index af0100b..456e111 100644
--- a/src/opengl/qgl_x11egl.cpp
+++ b/src/opengl/qgl_x11egl.cpp
@@ -435,30 +435,30 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pixmap, cons
// If the pixmap doesn't already have a valid surface, try binding it via EGLImage
// first, as going through EGLImage should be faster and better supported:
- if (!textureIsBound && haveEglImageTFP) {
- Q_ASSERT(eglCreateImageKHR);
-
- EGLImageKHR eglImage;
-
- EGLint attribs[] = {
- EGL_IMAGE_PRESERVED_KHR, EGL_TRUE,
- EGL_NONE
- };
- eglImage = eglCreateImageKHR(QEgl::display(), EGL_NO_CONTEXT, EGL_NATIVE_PIXMAP_KHR,
- (EGLClientBuffer)QEgl::nativePixmap(pixmap), attribs);
-
- QGLContext* ctx = q;
- glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, eglImage);
-
- GLint err = glGetError();
- if (err == GL_NO_ERROR)
- textureIsBound = true;
-
- // Once the egl image is bound, the texture becomes a new sibling image and we can safely
- // destroy the EGLImage we created for the pixmap:
- if (eglImage != EGL_NO_IMAGE_KHR)
- eglDestroyImageKHR(QEgl::display(), eglImage);
- }
+// if (!textureIsBound && haveEglImageTFP) {
+// Q_ASSERT(eglCreateImageKHR);
+//
+// EGLImageKHR eglImage;
+//
+// EGLint attribs[] = {
+// EGL_IMAGE_PRESERVED_KHR, EGL_TRUE,
+// EGL_NONE
+// };
+// eglImage = eglCreateImageKHR(QEgl::display(), EGL_NO_CONTEXT, EGL_NATIVE_PIXMAP_KHR,
+// (EGLClientBuffer)QEgl::nativePixmap(pixmap), attribs);
+//
+// QGLContext* ctx = q;
+// glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, eglImage);
+//
+// GLint err = glGetError();
+// if (err == GL_NO_ERROR)
+// textureIsBound = true;
+//
+// // Once the egl image is bound, the texture becomes a new sibling image and we can safely
+// // destroy the EGLImage we created for the pixmap:
+// if (eglImage != EGL_NO_IMAGE_KHR)
+// eglDestroyImageKHR(QEgl::display(), eglImage);
+// }
if (!textureIsBound && haveTFP) {
// Check to see if the surface is still valid