summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2016-11-30 16:45:54 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2016-12-01 04:08:16 +0000
commit9cc97f0c63049a8076476acc89c875c9e240abfb (patch)
tree54a64d10418c8432a993b8e03962ce67dbdee5a4
parentb44962c8bce5489deee289212282cdf2c89b425a (diff)
Disable surfaceless context supportv5.7.1
Using surfaceless EGL surface on imx6 embedded device crashes webengine with backtrace in gpu driver. Since this feature requires a bit more testing on embedded platforms disable support for the 5.7.1 release. Task-number: QTBUG-57290 Change-Id: I3ed5b6fc173d184486316a2c3d899a88d4b1de76 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/gl_surface_qt.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index a8214352..e7b45366 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -365,7 +365,8 @@ bool GLSurfaceQtEGL::InitializeOneOff()
LOG(ERROR) << "eglInitialize failed with error " << GetLastEGLErrorString();
return false;
}
-
+#if 0
+// QTBUG-57290
g_egl_surfaceless_context_supported = ExtensionsContain(g_extensions, "EGL_KHR_surfaceless_context");
if (g_egl_surfaceless_context_supported) {
scoped_refptr<GLSurface> surface = new GLSurfacelessQtEGL(Size(1, 1));
@@ -382,7 +383,7 @@ bool GLSurfaceQtEGL::InitializeOneOff()
context->ReleaseCurrent(surface.get());
}
}
-
+#endif
initialized = true;
return true;
}