Implement GLX for Ozone X11.

ui/gl/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
+import("//ui/ozone/ozone.gni")
 import("//testing/test.gni")
 
+use_egl = is_win || is_android || is_linux

[rjkroege, 2016/04/27 19:08:12]

So: what do ozone configurations that are !ozone_platform_x11  use? Can this be
made explicit?

[kylechar, 2016/04/27 19:36:32]

They use EGL or osemsa. What do you mean made explicit?

+use_glx = use_x11 || ozone_platform_x11
+
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 config("gl_config") {
-  if (use_x11) {
-    defines = [ "GL_GLEXT_PROTOTYPES" ]
+  defines = []
+  if (use_glx) {
+    defines += [
+      "GL_GLEXT_PROTOTYPES",
+      "USE_GLX",
+    ]
+  }
+  if (use_egl) {
+    defines += [ "USE_EGL" ]
   }
 }
 
 component("gl") {
   output_name = "gl_wrapper"  # Avoid colliding with OS X"s libGL.dylib.
 
   sources = [
     "android/gl_jni_registrar.cc",
     "android/gl_jni_registrar.h",
     "android/scoped_java_surface.cc",
@@ skipping 102 matching lines @@
   ]
   public_deps = [
     "//base",
     "//third_party/mesa:mesa_headers",
     "//ui/base/",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 
-  if (is_win || is_android || is_linux) {
+  if (use_egl) {
     sources += [
       "egl_util.cc",
       "egl_util.h",
       "gl_bindings_autogen_egl.cc",
       "gl_bindings_autogen_egl.h",
       "gl_context_egl.cc",
       "gl_context_egl.h",
+      "gl_egl_api_implementation.cc",
+      "gl_egl_api_implementation.h",
       "gl_fence_egl.cc",
       "gl_fence_egl.h",
       "gl_image_egl.cc",
       "gl_image_egl.h",
       "gl_surface_egl.cc",
       "gl_surface_egl.h",
     ]
   }
   if (is_android || is_linux) {
     sources += [
       "gl_implementation_osmesa.cc",
       "gl_implementation_osmesa.h",
     ]
   }
   if (!is_android) {  # TODO(GYP) Enable on Android when osmesa links.
     deps += [ "//third_party/mesa:osmesa" ]
   }
   if (use_x11) {
     sources += [
+      "gl_context_x11.cc",
+      "gl_implementation_x11.cc",
+      "gl_surface_egl_x11.cc",
+      "gl_surface_egl_x11.h",
+      "gl_surface_x11.cc",
+    ]
+
+    data_deps = [
+      "//third_party/angle:libEGL",
+      "//third_party/angle:libGLESv2",
+    ]
+  }
+  if (use_ozone) {
+    sources += [
+      "gl_context_ozone.cc",
+      "gl_image_ozone_native_pixmap.cc",
+      "gl_image_ozone_native_pixmap.h",
+      "gl_implementation_ozone.cc",
+      "gl_surface_ozone.cc",
+    ]
+
+    deps += [ "//ui/ozone" ]
+
+    if (ozone_platform_x11) {
+      deps += [ "//ui/events/platform/x11" ]
+    }
+  }
+  if (use_glx) {
+    sources += [
       "gl_bindings_autogen_glx.cc",
       "gl_bindings_autogen_glx.h",
       "gl_context_glx.cc",
       "gl_context_glx.h",
-      "gl_context_x11.cc",
-      "gl_egl_api_implementation.cc",
-      "gl_egl_api_implementation.h",
       "gl_glx_api_implementation.cc",
       "gl_glx_api_implementation.h",
       "gl_image_glx.cc",
       "gl_image_glx.h",
-      "gl_implementation_x11.cc",
-      "gl_surface_egl_x11.cc",
-      "gl_surface_egl_x11.h",
       "gl_surface_glx.cc",
       "gl_surface_glx.h",
-      "gl_surface_x11.cc",
     ]
 
     configs += [
       "//build/config/linux:x11",
       "//build/config/linux:xcomposite",
       "//build/config/linux:xext",
     ]
 
     deps += [ "//ui/gfx/x" ]
-    data_deps = [
-      "//third_party/angle:libEGL",
-      "//third_party/angle:libGLESv2",
-    ]
   }
   if (is_win) {
     sources += [
       "angle_platform_impl.cc",
       "angle_platform_impl.h",
       "gl_bindings_autogen_wgl.cc",
       "gl_bindings_autogen_wgl.h",
       "gl_context_wgl.cc",
       "gl_context_wgl.h",
-      "gl_egl_api_implementation.cc",
-      "gl_egl_api_implementation.h",
       "gl_surface_wgl.cc",
       "gl_surface_wgl.h",
       "gl_wgl_api_implementation.cc",
       "gl_wgl_api_implementation.h",
       "vsync_provider_win.cc",
       "vsync_provider_win.h",
     ]
 
     libs = [ "dwmapi.lib" ]
     ldflags = [ "/DELAYLOAD:dwmapi.dll" ]
@@ skipping 19 matching lines @@
     ]
 
     libs = [
       "IOSurface.framework",
       "OpenGL.framework",
       "Quartz.framework",
     ]
   }
   if (is_android) {
     sources += [
-      "gl_egl_api_implementation.cc",
-      "gl_egl_api_implementation.h",
       "gl_image_surface_texture.cc",
       "gl_image_surface_texture.h",
     ]
 
     defines += [
       "GL_GLEXT_PROTOTYPES",
       "EGL_EGLEXT_PROTOTYPES",
     ]
 
     libs = [ "android" ]
 
     deps += [
       ":gl_jni_headers",
       "//ui/android:ui_java",
     ]
   }
-  if (use_ozone) {
-    sources += [
-      "gl_context_ozone.cc",
-      "gl_egl_api_implementation.cc",
-      "gl_egl_api_implementation.h",
-      "gl_image_ozone_native_pixmap.cc",
-      "gl_image_ozone_native_pixmap.h",
-      "gl_implementation_ozone.cc",
-      "gl_surface_ozone.cc",
-    ]
-    deps += [ "//ui/ozone" ]
-  }
 }
 
 source_set("gl_unittest_utils") {
   testonly = true
   sources = [
     "gl_bindings_autogen_mock.cc",
     "gl_bindings_autogen_mock.h",
     "gl_mock.cc",
     "gl_mock.h",
     "gl_mock_autogen_gl.h",
@@ skipping 26 matching lines @@
 
   public_deps = [
     ":gl",
   ]
   deps = [
     "//testing/gtest",
   ]
 
   if (use_x11) {
     configs += [ "//build/config/linux:x11" ]
-    deps += [
-      "//ui/gfx/x",
-      "//ui/platform_window/x11",
-    ]
+    deps += [ "//ui/platform_window/x11" ]
   }
 }
 
 test("gl_unittests") {
   sources = [
     "gl_api_unittest.cc",
     "gl_image_ref_counted_memory_unittest.cc",
     "gl_image_shared_memory_unittest.cc",
     "gpu_timing_unittest.cc",
     "test/run_all_unittests.cc",
   ]
 
-  if (is_win || is_android || is_linux) {
+  if (use_egl) {
     sources += [
       "egl_api_unittest.cc",
       "test/egl_initialization_displays_unittest.cc",
     ]
   }
 
-  if (use_x11) {
+  if (use_glx) {
     sources += [ "glx_api_unittest.cc" ]
   }
 
   if (use_ozone) {
     sources += [ "gl_image_ozone_native_pixmap_unittest.cc" ]
   }
 
   if (is_mac) {
     sources += [ "gl_image_io_surface_unittest.cc" ]
   }
@@ skipping 31 matching lines @@
     sources = [
       "../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java",
       "../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java",
     ]
     public_deps = [
       ":surface_jni_headers",
     ]
     jni_package = "ui/gl"
   }
 }