| 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 b03d94a9ddb320c8802f30717cbae4a8043b07f6..db8cb4547de5a5bb0ac7247670a1e0b5e1c9418a 100644
|
| --- a/ui/gfx/gl/gl_implementation_linux.cc
|
| +++ b/ui/gfx/gl/gl_implementation_linux.cc
|
| @@ -48,13 +48,9 @@ base::NativeLibrary LoadLibrary(const char* filename) {
|
| } // namespace anonymous
|
|
|
| void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) {
|
| -#if !defined(USE_WAYLAND)
|
| impls->push_back(kGLImplementationDesktopGL);
|
| -#endif
|
| impls->push_back(kGLImplementationEGLGLES2);
|
| -#if !defined(USE_WAYLAND)
|
| impls->push_back(kGLImplementationOSMesaGL);
|
| -#endif
|
| }
|
|
|
| bool InitializeGLBindings(GLImplementation implementation) {
|
| @@ -71,7 +67,6 @@ bool InitializeGLBindings(GLImplementation implementation) {
|
| base::ThreadRestrictions::ScopedAllowIO allow_io;
|
|
|
| switch (implementation) {
|
| -#if !defined(USE_WAYLAND)
|
| case kGLImplementationOSMesaGL: {
|
| FilePath module_path;
|
| if (!PathService::Get(base::DIR_MODULE, &module_path)) {
|
| @@ -139,7 +134,6 @@ bool InitializeGLBindings(GLImplementation implementation) {
|
| InitializeGLBindingsGLX();
|
| break;
|
| }
|
| -#endif // !defined(USE_WAYLAND)
|
| case kGLImplementationEGLGLES2: {
|
| base::NativeLibrary gles_library = LoadLibrary("libGLESv2.so.2");
|
| if (!gles_library)
|
| @@ -192,7 +186,6 @@ bool InitializeGLBindings(GLImplementation implementation) {
|
| bool InitializeGLExtensionBindings(GLImplementation implementation,
|
| GLContext* context) {
|
| switch (implementation) {
|
| -#if !defined(USE_WAYLAND)
|
| case kGLImplementationOSMesaGL:
|
| InitializeGLExtensionBindingsGL(context);
|
| InitializeGLExtensionBindingsOSMESA(context);
|
| @@ -201,7 +194,6 @@ bool InitializeGLExtensionBindings(GLImplementation implementation,
|
| InitializeGLExtensionBindingsGL(context);
|
| InitializeGLExtensionBindingsGLX(context);
|
| break;
|
| -#endif
|
| case kGLImplementationEGLGLES2:
|
| InitializeGLExtensionBindingsGL(context);
|
| InitializeGLExtensionBindingsEGL(context);
|
| @@ -219,19 +211,15 @@ bool InitializeGLExtensionBindings(GLImplementation implementation,
|
| void InitializeDebugGLBindings() {
|
| InitializeDebugGLBindingsEGL();
|
| InitializeDebugGLBindingsGL();
|
| -#if !defined(USE_WAYLAND)
|
| InitializeDebugGLBindingsGLX();
|
| InitializeDebugGLBindingsOSMESA();
|
| -#endif
|
| }
|
|
|
| void ClearGLBindings() {
|
| ClearGLBindingsEGL();
|
| ClearGLBindingsGL();
|
| -#if !defined(USE_WAYLAND)
|
| ClearGLBindingsGLX();
|
| ClearGLBindingsOSMESA();
|
| -#endif
|
| SetGLImplementation(kGLImplementationNone);
|
|
|
| UnloadGLNativeLibraries();
|
|
|