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

Unified Diff: ui/gfx/gl/gl_context_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_bindings.h ('k') | ui/gfx/gl/gl_implementation_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_context_linux.cc
diff --git a/ui/gfx/gl/gl_context_linux.cc b/ui/gfx/gl/gl_context_linux.cc
index 238bd5f867e6f46caff1e0aa7a05398e6fa8e1ec..083b1ff08f7f2e6a2fe1977858cfb27cf4aaf684 100644
--- a/ui/gfx/gl/gl_context_linux.cc
+++ b/ui/gfx/gl/gl_context_linux.cc
@@ -26,6 +26,7 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
GLShareGroup* share_group,
GLSurface* compatible_surface) {
switch (GetGLImplementation()) {
+#if !defined(USE_WAYLAND)
case kGLImplementationOSMesaGL: {
scoped_refptr<GLContext> context(new GLContextOSMesa(share_group));
if (!context->Initialize(compatible_surface))
@@ -33,15 +34,16 @@ scoped_refptr<GLContext> GLContext::CreateGLContext(
return context;
}
- case kGLImplementationEGLGLES2: {
- scoped_refptr<GLContext> context(new GLContextEGL(share_group));
+ case kGLImplementationDesktopGL: {
+ scoped_refptr<GLContext> context(new GLContextGLX(share_group));
if (!context->Initialize(compatible_surface))
return NULL;
return context;
}
- case kGLImplementationDesktopGL: {
- scoped_refptr<GLContext> context(new GLContextGLX(share_group));
+#endif
+ case kGLImplementationEGLGLES2: {
+ scoped_refptr<GLContext> context(new GLContextEGL(share_group));
if (!context->Initialize(compatible_surface))
return NULL;
« no previous file with comments | « ui/gfx/gl/gl_bindings.h ('k') | ui/gfx/gl/gl_implementation_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698