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

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

Issue 10009024: Remove WAYLAND port (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 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
« 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 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();
« 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