Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl_implementation.cc

Issue 1723303002: Implement GLX for Ozone X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« content/gpu/gpu_main.cc ('K') | « ui/gl/gl_context_ozone.cc ('k') | ui/gl/gl_implementation_ozone.cc » ('j') | ui/gl/gl_surface_ozone.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_implementation.cc
diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc
index af06cbee98193f7033bdd313a7a6866223013bea..dfb1548ba8c4d69e22f812deffd6a62c72f7ed16 100644
--- a/ui/gl/gl_implementation.cc
+++ b/ui/gl/gl_implementation.cc
@@ -58,24 +58,16 @@ void CleanupNativeLibraries(void* unused) {
base::ThreadLocalPointer<GLApi>* g_current_gl_context_tls = NULL;
OSMESAApi* g_current_osmesa_context;
-#if defined(OS_WIN)
-
+#if defined(USE_EGL)
EGLApi* g_current_egl_context;
-WGLApi* g_current_wgl_context;
+#endif
-#elif defined(USE_X11)
+#if defined(OS_WIN)
+WGLApi* g_current_wgl_context;
+#endif
-EGLApi* g_current_egl_context;
+#if defined(USE_GLX)
GLXApi* g_current_glx_context;
-
-#elif defined(USE_OZONE)
-
-EGLApi* g_current_egl_context;
-
-#elif defined(OS_ANDROID)
-
-EGLApi* g_current_egl_context;
-
#endif
GLImplementation GetNamedGLImplementation(const std::string& name) {
« content/gpu/gpu_main.cc ('K') | « ui/gl/gl_context_ozone.cc ('k') | ui/gl/gl_implementation_ozone.cc » ('j') | ui/gl/gl_surface_ozone.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698