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

Unified Diff: ui/gfx/gl/gl_implementation_linux.cc

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Adding missing WaylandDisplay include Created 9 years, 4 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
« no previous file with comments | « ui/gfx/gl/gl_context_linux.cc ('k') | ui/gfx/gl/gl_surface_egl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_implementation_linux.cc
diff --git a/ui/gfx/gl/gl_implementation_linux.cc b/ui/gfx/gl/gl_implementation_linux.cc
index 7baf2f6b4a6a125740531b093d1f4bd12a8e6ff8..97e30877bc4ad49fe35958f56c8a366dc0975a42 100644
--- a/ui/gfx/gl/gl_implementation_linux.cc
+++ b/ui/gfx/gl/gl_implementation_linux.cc
@@ -53,6 +53,7 @@ bool InitializeGLBindings(GLImplementation implementation) {
return true;
switch (implementation) {
+#if !defined(USE_WAYLAND)
case kGLImplementationOSMesaGL: {
FilePath module_path;
if (!PathService::Get(base::DIR_MODULE, &module_path)) {
@@ -106,6 +107,7 @@ bool InitializeGLBindings(GLImplementation implementation) {
InitializeGLBindingsGLX();
break;
}
+#endif // !defined(USE_WAYLAND)
case kGLImplementationEGLGLES2: {
base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so");
if (!gles_library)
@@ -158,8 +160,10 @@ bool InitializeGLBindings(GLImplementation implementation) {
void InitializeDebugGLBindings() {
InitializeDebugGLBindingsEGL();
InitializeDebugGLBindingsGL();
+#if !defined(USE_WAYLAND)
InitializeDebugGLBindingsGLX();
InitializeDebugGLBindingsOSMESA();
+#endif
}
} // namespace gfx
« no previous file with comments | « ui/gfx/gl/gl_context_linux.cc ('k') | ui/gfx/gl/gl_surface_egl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698