OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/gl/gl_context.h" | 5 #include "ui/gl/gl_context.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/sys_info.h" | 9 #include "base/sys_info.h" |
10 #include "ui/gl/gl_bindings.h" | 10 #include "ui/gl/gl_bindings.h" |
11 #include "ui/gl/gl_context_egl.h" | 11 #include "ui/gl/gl_context_egl.h" |
12 #include "ui/gl/gl_context_osmesa.h" | |
12 #include "ui/gl/gl_context_stub.h" | 13 #include "ui/gl/gl_context_stub.h" |
13 #include "ui/gl/gl_implementation.h" | 14 #include "ui/gl/gl_implementation.h" |
14 #include "ui/gl/gl_surface.h" | 15 #include "ui/gl/gl_surface.h" |
15 | 16 |
16 namespace gfx { | 17 namespace gfx { |
17 | 18 |
18 // static | 19 // static |
19 scoped_refptr<GLContext> GLContext::CreateGLContext( | 20 scoped_refptr<GLContext> GLContext::CreateGLContext( |
20 GLShareGroup* share_group, | 21 GLShareGroup* share_group, |
21 GLSurface* compatible_surface, | 22 GLSurface* compatible_surface, |
22 GpuPreference gpu_preference) { | 23 GpuPreference gpu_preference) { |
jonathan.backer
2013/06/27 17:13:28
Could you use a switch here? That way we'll valida
rjkroege
2013/06/28 00:25:01
I assume that you mean structure it with the case
| |
23 if (GetGLImplementation() == kGLImplementationMockGL) | 24 if (GetGLImplementation() == kGLImplementationMockGL) |
24 return scoped_refptr<GLContext>(new GLContextStub()); | 25 return scoped_refptr<GLContext>(new GLContextStub()); |
25 | 26 |
27 if (GetGLImplementation() == kGLImplementationOSMesaGL) { | |
28 scoped_refptr<GLContext> context(new GLContextOSMesa(share_group)); | |
29 if (!context->Initialize(compatible_surface, gpu_preference)) | |
30 return NULL; | |
31 return context; | |
32 } | |
33 | |
26 scoped_refptr<GLContext> context; | 34 scoped_refptr<GLContext> context; |
27 if (!compatible_surface->GetHandle()) { | 35 if (!compatible_surface->GetHandle()) { |
28 DLOG(ERROR) << "Surface has no associated handle.\n"; | 36 DLOG(ERROR) << "Surface has no associated handle.\n"; |
29 return NULL; | 37 return NULL; |
30 } | 38 } |
jonathan.backer
2013/06/27 17:13:28
I'm curious why we have this check here. It seems
rjkroege
2013/06/28 00:25:01
It was unnecessary code. I've removed.
| |
31 | 39 |
32 context = new GLContextEGL(share_group); | 40 context = new GLContextEGL(share_group); |
33 | 41 |
34 if (!context->Initialize(compatible_surface, gpu_preference)) | 42 if (!context->Initialize(compatible_surface, gpu_preference)) |
35 return NULL; | 43 return NULL; |
36 return context; | 44 return context; |
37 } | 45 } |
38 | 46 |
39 } // namespace gfx | 47 } // namespace gfx |
40 | 48 |
OLD | NEW |