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

Side by Side Diff: trunk/src/ui/gl/gl_bindings.h

Issue 149953003: Revert 247793 "Ensure GL initialization only happens once, and p..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/ui/compositor/test/test_suite.cc ('k') | trunk/src/ui/gl/gl_gl_api_implementation.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 #ifndef UI_GL_GL_BINDINGS_H_ 5 #ifndef UI_GL_GL_BINDINGS_H_
6 #define UI_GL_GL_BINDINGS_H_ 6 #define UI_GL_GL_BINDINGS_H_
7 7
8 // Includes the platform independent and platform dependent GL headers. 8 // Includes the platform independent and platform dependent GL headers.
9 // Only include this in cc files. It pulls in system headers, including 9 // Only include this in cc files. It pulls in system headers, including
10 // the X11 headers on linux, which define all kinds of macros that are 10 // the X11 headers on linux, which define all kinds of macros that are
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 #include "gl_bindings_autogen_glx.h" 218 #include "gl_bindings_autogen_glx.h"
219 #elif defined(USE_OZONE) 219 #elif defined(USE_OZONE)
220 #include "gl_bindings_autogen_egl.h" 220 #include "gl_bindings_autogen_egl.h"
221 #elif defined(OS_ANDROID) 221 #elif defined(OS_ANDROID)
222 #include "gl_bindings_autogen_egl.h" 222 #include "gl_bindings_autogen_egl.h"
223 #endif 223 #endif
224 224
225 namespace gfx { 225 namespace gfx {
226 226
227 struct GL_EXPORT DriverGL { 227 struct GL_EXPORT DriverGL {
228 DriverGL();
229
230 void InitializeStaticBindings(); 228 void InitializeStaticBindings();
231 void InitializeCustomDynamicBindings(GLContext* context); 229 void InitializeCustomDynamicBindings(GLContext* context);
232 void InitializeDebugBindings(); 230 void InitializeDebugBindings();
233 void InitializeNullDrawBindings(); 231 void InitializeNullDrawBindings();
234 void ClearBindings(); 232 void ClearBindings();
235 233
236 ProcsGL fn; 234 ProcsGL fn;
237 ProcsGL orig_fn; 235 ProcsGL orig_fn;
238 ProcsGL debug_fn; 236 ProcsGL debug_fn;
239 ExtensionsGL ext; 237 ExtensionsGL ext;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 #elif defined(OS_ANDROID) 320 #elif defined(OS_ANDROID)
323 321
324 GL_EXPORT extern EGLApi* g_current_egl_context; 322 GL_EXPORT extern EGLApi* g_current_egl_context;
325 GL_EXPORT extern DriverEGL g_driver_egl; 323 GL_EXPORT extern DriverEGL g_driver_egl;
326 324
327 #endif 325 #endif
328 326
329 } // namespace gfx 327 } // namespace gfx
330 328
331 #endif // UI_GL_GL_BINDINGS_H_ 329 #endif // UI_GL_GL_BINDINGS_H_
OLDNEW
« no previous file with comments | « trunk/src/ui/compositor/test/test_suite.cc ('k') | trunk/src/ui/gl/gl_gl_api_implementation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698