diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-12 14:02:28 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-12 12:45:26 +0000 |
| commit | 6e6e2655bf03f2cc903f17d9e5283a81a4a837c2 (patch) | |
| tree | af2359f87ffb51301c7edd2f6091a9a50b82848f | |
| parent | d07fba149ddc6df4cbc99d31b1edb17331fcfe53 (diff) | |
Fix crash on XCB GLES2 and Wayland
We can and must request the "egldisplay" from QPA, otherwise we get
the wrong resource.
Task-number: QTBUG-47301
Change-Id: I8bcd94415aa8f22b0d868ad751017f5babddf751
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| -rw-r--r-- | src/core/gl_surface_qt.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index 5a27aa98f..584bdc227 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -324,13 +324,7 @@ bool GLSurfaceQtEGL::InitializeOneOff() if (initialized) return true; -#if defined(USE_X11) - EGLNativeDisplayType nativeDisplay = reinterpret_cast<EGLNativeDisplayType>(GLContextHelper::getXDisplay()); - g_display = eglGetDisplay(nativeDisplay); -#else g_display = GLContextHelper::getEGLDisplay(); -#endif - if (!g_display) { LOG(ERROR) << "GLContextHelper::getEGLDisplay() failed."; return false; |