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

Side by Side Diff: ui/gl/gl_implementation_mac.cc

Issue 893213002: Revert of Make GL bindings conditional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « ui/gl/gl_implementation_android.cc ('k') | ui/gl/gl_implementation_ozone.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) 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 "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/mac/foundation_util.h" 8 #include "base/mac/foundation_util.h"
9 #include "base/native_library.h" 9 #include "base/native_library.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 return false; 105 return false;
106 } 106 }
107 107
108 return true; 108 return true;
109 } 109 }
110 110
111 bool InitializeDynamicGLBindings(GLImplementation implementation, 111 bool InitializeDynamicGLBindings(GLImplementation implementation,
112 GLContext* context) { 112 GLContext* context) {
113 switch (implementation) { 113 switch (implementation) {
114 case kGLImplementationOSMesaGL: 114 case kGLImplementationOSMesaGL:
115 InitializeDynamicGLBindingsGL(context);
116 InitializeDynamicGLBindingsOSMESA(context);
117 break;
115 case kGLImplementationDesktopGL: 118 case kGLImplementationDesktopGL:
116 case kGLImplementationAppleGL: 119 case kGLImplementationAppleGL:
117 InitializeDynamicGLBindingsGL(context); 120 InitializeDynamicGLBindingsGL(context);
118 break; 121 break;
119 case kGLImplementationMockGL: 122 case kGLImplementationMockGL:
120 if (!context) { 123 if (!context) {
121 scoped_refptr<GLContextStubWithExtensions> mock_context( 124 scoped_refptr<GLContextStubWithExtensions> mock_context(
122 new GLContextStubWithExtensions()); 125 new GLContextStubWithExtensions());
123 mock_context->SetGLVersionString("3.0"); 126 mock_context->SetGLVersionString("3.0");
124 InitializeDynamicGLBindingsGL(mock_context.get()); 127 InitializeDynamicGLBindingsGL(mock_context.get());
(...skipping 18 matching lines...) Expand all
143 SetGLImplementation(kGLImplementationNone); 146 SetGLImplementation(kGLImplementationNone);
144 147
145 UnloadGLNativeLibraries(); 148 UnloadGLNativeLibraries();
146 } 149 }
147 150
148 bool GetGLWindowSystemBindingInfo(GLWindowSystemBindingInfo* info) { 151 bool GetGLWindowSystemBindingInfo(GLWindowSystemBindingInfo* info) {
149 return false; 152 return false;
150 } 153 }
151 154
152 } // namespace gfx 155 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_implementation_android.cc ('k') | ui/gl/gl_implementation_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698