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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/gl/gl_context.h" 5 #include "ui/gfx/gl/gl_context.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "third_party/mesa/MesaLib/include/GL/osmesa.h" 9 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
10 #include "ui/gfx/gl/gl_bindings.h" 10 #include "ui/gfx/gl/gl_bindings.h"
11 #include "ui/gfx/gl/gl_context_egl.h" 11 #include "ui/gfx/gl/gl_context_egl.h"
12 #include "ui/gfx/gl/gl_context_glx.h" 12 #include "ui/gfx/gl/gl_context_glx.h"
13 #include "ui/gfx/gl/gl_context_osmesa.h" 13 #include "ui/gfx/gl/gl_context_osmesa.h"
14 #include "ui/gfx/gl/gl_context_stub.h" 14 #include "ui/gfx/gl/gl_context_stub.h"
15 #include "ui/gfx/gl/gl_implementation.h" 15 #include "ui/gfx/gl/gl_implementation.h"
16 #include "ui/gfx/gl/gl_surface_egl.h" 16 #include "ui/gfx/gl/gl_surface_egl.h"
17 #include "ui/gfx/gl/gl_surface_glx.h" 17 #include "ui/gfx/gl/gl_surface_glx.h"
18 #include "ui/gfx/gl/gl_surface_stub.h" 18 #include "ui/gfx/gl/gl_surface_stub.h"
19 #include "ui/gfx/gl/gl_surface_osmesa.h" 19 #include "ui/gfx/gl/gl_surface_osmesa.h"
20 20
21 namespace gfx { 21 namespace gfx {
22 22
23 class GLShareGroup; 23 class GLShareGroup;
24 24
25 scoped_refptr<GLContext> GLContext::CreateGLContext( 25 scoped_refptr<GLContext> GLContext::CreateGLContext(
26 GLShareGroup* share_group, 26 GLShareGroup* share_group,
27 GLSurface* compatible_surface) { 27 GLSurface* compatible_surface) {
28 switch (GetGLImplementation()) { 28 switch (GetGLImplementation()) {
29 #if !defined(USE_WAYLAND)
29 case kGLImplementationOSMesaGL: { 30 case kGLImplementationOSMesaGL: {
30 scoped_refptr<GLContext> context(new GLContextOSMesa(share_group)); 31 scoped_refptr<GLContext> context(new GLContextOSMesa(share_group));
31 if (!context->Initialize(compatible_surface)) 32 if (!context->Initialize(compatible_surface))
32 return NULL; 33 return NULL;
33 34
34 return context; 35 return context;
35 } 36 }
36 case kGLImplementationEGLGLES2: {
37 scoped_refptr<GLContext> context(new GLContextEGL(share_group));
38 if (!context->Initialize(compatible_surface))
39 return NULL;
40
41 return context;
42 }
43 case kGLImplementationDesktopGL: { 37 case kGLImplementationDesktopGL: {
44 scoped_refptr<GLContext> context(new GLContextGLX(share_group)); 38 scoped_refptr<GLContext> context(new GLContextGLX(share_group));
45 if (!context->Initialize(compatible_surface)) 39 if (!context->Initialize(compatible_surface))
46 return NULL; 40 return NULL;
47 41
42 return context;
43 }
44 #endif
45 case kGLImplementationEGLGLES2: {
46 scoped_refptr<GLContext> context(new GLContextEGL(share_group));
47 if (!context->Initialize(compatible_surface))
48 return NULL;
49
48 return context; 50 return context;
49 } 51 }
50 case kGLImplementationMockGL: 52 case kGLImplementationMockGL:
51 return new GLContextStub; 53 return new GLContextStub;
52 default: 54 default:
53 NOTREACHED(); 55 NOTREACHED();
54 return NULL; 56 return NULL;
55 } 57 }
56 } 58 }
57 59
58 } // namespace gfx 60 } // namespace gfx
OLDNEW
« 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