From 9cc97f0c63049a8076476acc89c875c9e240abfb Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 30 Nov 2016 16:45:54 +0100 Subject: Disable surfaceless context support 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 --- src/core/gl_surface_qt.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index a82143525..e7b45366b 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 surface = new GLSurfacelessQtEGL(Size(1, 1)); @@ -382,7 +383,7 @@ bool GLSurfaceQtEGL::InitializeOneOff() context->ReleaseCurrent(surface.get()); } } - +#endif initialized = true; return true; } -- cgit v1.2.3