Revert "Add support for EGL_EXT_platform_xcb"

This reverts commit 816c5de. Reason for revert: Causes crash on Nvidia when Qt is configured with -opengl es2 Fixes: QTBUG-97738 Change-Id: I9fe43146b922fc770890a144fdb1bd1c564635bb Reviewed-by: Laszlo Agocs <[email protected]>
HoBoIs · Nov 2, 2021 · 059c48b · 059c48b
1 parent 8ba3a2f
commit 059c48b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/src/gui/opengl/platform/egl/qeglstreamconvenience_p.h b/src/gui/opengl/platform/egl/qeglstreamconvenience_p.h
@@ -149,10 +149,6 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMEROUTPUTEXTPROC) (EGLDisplay
 #define EGL_PLATFORM_X11_KHR              0x31D5
 #endif
 
-#ifndef EGL_PLATFORM_XCB_KHR
-#define EGL_PLATFORM_XCB_KHR              0x31DC
-#endif
-
 #ifndef EGL_NV_stream_attrib
 typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMATTRIBNVPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list);
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSTREAMATTRIBNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLAttrib value);

diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.cpp
@@ -67,12 +67,7 @@ bool QXcbEglIntegration::initialize(QXcbConnection *connection)
 
     const char *extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
 
-    if (extensions && (strstr(extensions, "EGL_EXT_platform_xcb") || strstr(extensions, "EGL_MESA_platform_xcb"))) {
-        QEGLStreamConvenience streamFuncs;
-        m_egl_display = streamFuncs.get_platform_display(EGL_PLATFORM_XCB_KHR,
-                                                         reinterpret_cast<void *>(connection->xcb_connection()),
-                                                         nullptr);
-    } else if (extensions && strstr(extensions, "EGL_EXT_platform_x11")) {
+    if (extensions && strstr(extensions, "EGL_EXT_platform_x11")) {
         QEGLStreamConvenience streamFuncs;
         m_egl_display = streamFuncs.get_platform_display(EGL_PLATFORM_X11_KHR,
                                                          xlib_display(),