OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_surface.h" | 5 #include "ui/gl/gl_surface.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "third_party/mesa/src/include/GL/osmesa.h" | 10 #include "third_party/mesa/src/include/GL/osmesa.h" |
11 #include "ui/gl/gl_bindings.h" | 11 #include "ui/gl/gl_bindings.h" |
12 #include "ui/gl/gl_implementation.h" | 12 #include "ui/gl/gl_implementation.h" |
13 #include "ui/gl/gl_surface_cgl.h" | 13 #include "ui/gl/gl_surface_cgl.h" |
14 #include "ui/gl/gl_surface_osmesa.h" | 14 #include "ui/gl/gl_surface_osmesa.h" |
15 #include "ui/gl/gl_surface_stub.h" | 15 #include "ui/gl/gl_surface_stub.h" |
16 #include "ui/gl/gl_surface_nsview.h" | 16 #include "ui/gl/gl_surface_nsview.h" |
17 | 17 |
18 namespace gfx { | 18 namespace gfx { |
19 | 19 |
| 20 bool GLSurface::InitializePreBindingsInternal(GLImplementation) { |
| 21 return true; |
| 22 } |
| 23 |
20 bool GLSurface::InitializeOneOffInternal() { | 24 bool GLSurface::InitializeOneOffInternal() { |
21 switch (GetGLImplementation()) { | 25 switch (GetGLImplementation()) { |
22 case kGLImplementationDesktopGL: | 26 case kGLImplementationDesktopGL: |
23 case kGLImplementationAppleGL: | 27 case kGLImplementationAppleGL: |
24 if (!GLSurfaceCGL::InitializeOneOff()) { | 28 if (!GLSurfaceCGL::InitializeOneOff()) { |
25 LOG(ERROR) << "GLSurfaceCGL::InitializeOneOff failed."; | 29 LOG(ERROR) << "GLSurfaceCGL::InitializeOneOff failed."; |
26 return false; | 30 return false; |
27 } | 31 } |
28 break; | 32 break; |
29 default: | 33 default: |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 } | 78 } |
75 case kGLImplementationMockGL: | 79 case kGLImplementationMockGL: |
76 return new GLSurfaceStub; | 80 return new GLSurfaceStub; |
77 default: | 81 default: |
78 NOTREACHED(); | 82 NOTREACHED(); |
79 return NULL; | 83 return NULL; |
80 } | 84 } |
81 } | 85 } |
82 | 86 |
83 } // namespace gfx | 87 } // namespace gfx |
OLD | NEW |