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

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

Issue 8601005: wayland: Fix GL extension binding init to work again for use_wayland (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Also fix GetAllowedGLImplementatoins. Created 9 years, 1 month 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 | « no previous file | no next file » | 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 eed0a15d9b746d0bf187d80359e9ee5d1d1886e6..8e8fa379a74efa1bdec092de615d68d0768f3110 100644
--- a/ui/gfx/gl/gl_implementation_linux.cc
+++ b/ui/gfx/gl/gl_implementation_linux.cc
@@ -57,9 +57,11 @@ base::LazyInstance<base::Lock,
} // namespace anonymous
void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
+#if !defined(USE_WAYLAND)
+ impls->push_back(kGLImplementationOSMesaGL);
impls->push_back(kGLImplementationDesktopGL);
+#endif
impls->push_back(kGLImplementationEGLGLES2);
- impls->push_back(kGLImplementationOSMesaGL);
}
bool InitializeGLBindings(GLImplementation implementation) {
@@ -190,6 +192,7 @@ bool InitializeGLBindings(GLImplementation implementation) {
bool InitializeGLExtensionBindings(GLImplementation implementation,
GLContext* context) {
switch (implementation) {
+#if !defined(USE_WAYLAND)
case kGLImplementationOSMesaGL:
InitializeGLExtensionBindingsGL(context);
InitializeGLExtensionBindingsOSMESA(context);
@@ -198,6 +201,7 @@ bool InitializeGLExtensionBindings(GLImplementation implementation,
InitializeGLExtensionBindingsGL(context);
InitializeGLExtensionBindingsGLX(context);
break;
+#endif
case kGLImplementationEGLGLES2:
InitializeGLExtensionBindingsGL(context);
InitializeGLExtensionBindingsEGL(context);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698