| 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);
|
|
|