summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-01-16 11:42:43 +0100
committerLiang Qi <liang.qi@qt.io>2017-01-16 11:43:08 +0100
commit6232d02139c55f7b941b7ca939d13047f30794fe (patch)
treed10a9508bae36244791f968b8bb431b7ab5722d0
parent6766290699acd0d73c81cf690012d52729e518b9 (diff)
parent9cc97f0c63049a8076476acc89c875c9e240abfb (diff)
Merge remote-tracking branch 'origin/5.7.1' into 5.75.7
-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;
}