Implement GLX for Ozone X11.

ui/gl/gl_bindings.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_GL_GL_BINDINGS_H_
 #define UI_GL_GL_BINDINGS_H_
 
 // Includes the platform independent and platform dependent GL headers.
 // Only include this in cc files. It pulls in system headers, including
 // the X11 headers on linux, which define all kinds of macros that are
@@ skipping 10 matching lines @@
 #include "base/logging.h"
 #include "base/threading/thread_local.h"
 #include "build/build_config.h"
 #include "ui/gl/gl_export.h"
 
 // The standard OpenGL native extension headers are also included.
 #if defined(OS_WIN)
 #include <GL/wglext.h>
 #elif defined(OS_MACOSX)
 #include <OpenGL/OpenGL.h>
-#elif defined(USE_X11)
+#elif defined(USE_GLX)
 #include <GL/glx.h>
 #include <GL/glxext.h>
 
 // Undefine some macros defined by X headers. This is why this file should only
 // be included in .cc files.
 #undef Bool
 #undef None
 #undef Status
 #endif
 
@@ skipping 323 matching lines @@
 // Forward declare OSMesa types.
 typedef struct osmesa_context *OSMesaContext;
 typedef void (*OSMESAproc)();
 
 // Forward declare EGL types.
 typedef uint64_t EGLuint64CHROMIUM;
 
 #include "gl_bindings_autogen_gl.h"
 #include "gl_bindings_autogen_osmesa.h"
 
-#if defined(OS_WIN)
-#include "gl_bindings_autogen_egl.h"
-#include "gl_bindings_autogen_wgl.h"
-#elif defined(USE_X11)
-#include "gl_bindings_autogen_egl.h"
-#include "gl_bindings_autogen_glx.h"
-#elif defined(USE_OZONE)
-#include "gl_bindings_autogen_egl.h"
-#elif defined(OS_ANDROID)
+#if defined(USE_EGL)
 #include "gl_bindings_autogen_egl.h"
 #endif
 
+#if defined(OS_WIN)
+#include "gl_bindings_autogen_wgl.h"
+#endif
+
+#if defined(USE_GLX)
+#include "gl_bindings_autogen_glx.h"
+#endif
+
 namespace gfx {
 
 struct GL_EXPORT DriverGL {
   void InitializeStaticBindings();
   void InitializeCustomDynamicBindings(GLContext* context);
   void InitializeDebugBindings();
   void InitializeNullDrawBindings();
   // TODO(danakj): Remove this when all test suites are using null-draw.
   bool HasInitializedNullDrawBindings();
   bool SetNullDrawBindingsEnabled(bool enabled);
@@ skipping 32 matching lines @@
 
   ProcsWGL fn;
   ProcsWGL debug_fn;
   ExtensionsWGL ext;
 
  private:
   static std::string GetPlatformExtensions();
 };
 #endif
 
-#if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
+#if defined(USE_EGL)
 struct GL_EXPORT DriverEGL {
   void InitializeStaticBindings();
   void InitializeExtensionBindings();
   void InitializeDebugBindings();
   void ClearBindings();
 
   ProcsEGL fn;
   ProcsEGL debug_fn;
   ExtensionsEGL ext;
 
   static std::string GetPlatformExtensions();
   static std::string GetClientExtensions();
 };
 #endif
 
-#if defined(USE_X11)
+#if defined(USE_GLX)
 struct GL_EXPORT DriverGLX {
   void InitializeStaticBindings();
   void InitializeExtensionBindings();
   void InitializeDebugBindings();
   void ClearBindings();
 
   ProcsGLX fn;
   ProcsGLX debug_fn;
   ExtensionsGLX ext;
 
  private:
   static std::string GetPlatformExtensions();
 };
 #endif
 
 // This #define is here to support autogenerated code.
 #define g_current_gl_context g_current_gl_context_tls->Get()
 GL_EXPORT extern base::ThreadLocalPointer<GLApi>* g_current_gl_context_tls;
 
 GL_EXPORT extern OSMESAApi* g_current_osmesa_context;
 GL_EXPORT extern DriverGL g_driver_gl;
 GL_EXPORT extern DriverOSMESA g_driver_osmesa;
 
-#if defined(OS_WIN)
-
-GL_EXPORT extern EGLApi* g_current_egl_context;
-GL_EXPORT extern WGLApi* g_current_wgl_context;
-GL_EXPORT extern DriverEGL g_driver_egl;
-GL_EXPORT extern DriverWGL g_driver_wgl;
-
-#elif defined(USE_X11)
-
-GL_EXPORT extern EGLApi* g_current_egl_context;
-GL_EXPORT extern GLXApi* g_current_glx_context;
-GL_EXPORT extern DriverEGL g_driver_egl;
-GL_EXPORT extern DriverGLX g_driver_glx;
-
-#elif defined(USE_OZONE)
-
+#if defined(USE_EGL)
 GL_EXPORT extern EGLApi* g_current_egl_context;
 GL_EXPORT extern DriverEGL g_driver_egl;
+#endif
 
-#elif defined(OS_ANDROID)
+#if defined(OS_WIN)
+GL_EXPORT extern WGLApi* g_current_wgl_context;
+GL_EXPORT extern DriverWGL g_driver_wgl;
+#endif
 
-GL_EXPORT extern EGLApi* g_current_egl_context;
-GL_EXPORT extern DriverEGL g_driver_egl;
-
+#if defined(USE_GLX)
+GL_EXPORT extern GLXApi* g_current_glx_context;
+GL_EXPORT extern DriverGLX g_driver_glx;
 #endif
 
 }  // namespace gfx
 
 #endif  // UI_GL_GL_BINDINGS_H_