Revert "Restore GLX usage"

This reverts commit eb94d3a.

Change-Id: I057e10ae27ca115aa085a34e6d8a3f433b389580
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/596600
Reviewed-by: Allan Sandfeld Jensen <[email protected]>

Author: stampho

chromium/tools/v8_context_snapshot/qt_overrides.cc

@@ -40,6 +40,9 @@ bool GLSurfaceGLX::IsCreateContextES2ProfileSupported() {
 bool GLSurfaceGLX::IsCreateContextSupported() {
   return false;
 }
+bool GLSurfaceGLX::InitializeExtensionSettingsOneOff() {
+  return false;
+}
 } // namespace gl
 #endif  // if BUILDFLAG(IS_LINUX) && BUILDFLAG(IS_OZONE_X11)
 

chromium/ui/gl/BUILD.gn

@@ -19,11 +19,8 @@ declare_args() {
   # Whether service side logging (actual calls into the GL driver) is enabled
   # or not.
   enable_gpu_service_logging = false
-  use_glx = false
 }
 
-use_glx = ozone_platform_x11
-
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ -44,11 +41,6 @@ buildflag_header("buildflags") {
 
 config("gl_config") {
   defines = []
-  if (use_glx) {
-    defines += [
-      "USE_GLX",
-    ]
-  }
   if (use_egl) {
     defines += [ "USE_EGL" ]
   }
@@ -274,8 +266,6 @@ jumbo_component("gl") {
       "gl_surface_egl_x11.h",
       "gl_surface_egl_x11_gles2.cc",
       "gl_surface_egl_x11_gles2.h",
-      "gl_surface_glx_x11.cc",
-      "gl_surface_glx_x11.h",
     ]
 
     deps += [
@@ -295,23 +285,6 @@ jumbo_component("gl") {
     }
   }
 
-  if (use_glx) {
-    sources += [
-      "gl_bindings_autogen_glx.cc",
-      "gl_bindings_autogen_glx.h",
-      "gl_context_glx.cc",
-      "gl_context_glx.h",
-      "gl_glx_api_implementation.cc",
-      "gl_glx_api_implementation.h",
-      "gl_surface_glx.h",
-    ]
-
-    deps += [
-      "//ui/base/x",
-      "//ui/gfx/x",
-    ]
-  }
-
   if (is_win) {
     sources += [
       "child_window_win.cc",
@@ -596,10 +569,6 @@ test("gl_unittests") {
     ]
   }
 
-  if (use_glx) {
-    sources += [ "glx_api_unittest.cc" ]
-  }
-
   if (is_win) {
     sources += [
       "dcomp_presenter_unittest.cc",

chromium/ui/gl/gl_bindings.h

@@ -36,7 +36,7 @@
 #include <GL/wglext.h>
 #elif BUILDFLAG(IS_MAC)
 #include <OpenGL/OpenGL.h>
-#elif defined(USE_GLX)
+#elif BUILDFLAG(IS_LINUX)
 using Display = struct _XDisplay;
 using Bool = int;
 using Status = int;
@@ -45,18 +45,6 @@ using Colormap = XID;
 using Font = XID;
 using Pixmap = XID;
 using Window = XID;
-using GLXPixmap = XID;
-using GLXWindow = XID;
-using GLXDrawable = XID;
-using GLXPbuffer = XID;
-using GLXContextID = XID;
-using GLXContext = struct __GLXcontextRec*;
-using GLXFBConfig = struct __GLXFBConfigRec*;
-struct XVisualInfo;
-
-
-#include <GL/glxext.h>
-#include <GL/glxtokens.h>
 #endif
 
 // GLES2 defines not part of Desktop GL
@@ -547,12 +535,7 @@ struct GL_EXPORT DriverEGL {
 #if defined(USE_GLX)
 struct GL_EXPORT DriverGLX {
   void InitializeStaticBindings();
-#if BUILDFLAG(IS_QTWEBENGINE)
-  void InitializeExtensionBindings(const std::string&);
-#else
   void InitializeExtensionBindings();
-#endif
-
   void ClearBindings();
 
   ProcsGLX fn;