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

Unified Diff: ui/gl/gl_gl_api_implementation.cc

Issue 94963003: Take GL version and extensions correctly into account when binding functions (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressed review feedback and Mac build failure Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: ui/gl/gl_gl_api_implementation.cc
diff --git a/ui/gl/gl_gl_api_implementation.cc b/ui/gl/gl_gl_api_implementation.cc
index eade3cedaf5e6df54041372b964335aa7937edca..966ae980d3a237f98568be92e7d59b9211edc079 100644
--- a/ui/gl/gl_gl_api_implementation.cc
+++ b/ui/gl/gl_gl_api_implementation.cc
@@ -146,12 +146,8 @@ static void GL_BINDING_CALL CustomRenderbufferStorageMultisampleEXT(
} // anonymous namespace
-void DriverGL::Initialize() {
- InitializeBindings();
-}
-
-void DriverGL::InitializeExtensions(GLContext* context) {
- InitializeExtensionBindings(context);
+void DriverGL::InitializeDynamic(GLContext* context) {
+ InitializeDynamicBindings(context);
orig_fn = fn;
fn.glTexImage2DFn =
reinterpret_cast<glTexImage2DProc>(CustomTexImage2D);
@@ -167,9 +163,9 @@ void DriverGL::InitializeExtensions(GLContext* context) {
CustomRenderbufferStorageMultisampleEXT);
}
-void InitializeGLBindingsGL() {
+void InitializeStaticGLBindingsGL() {
g_current_gl_context_tls = new base::ThreadLocalPointer<GLApi>;
- g_driver_gl.Initialize();
+ g_driver_gl.InitializeStaticBindings();
if (!g_real_gl) {
g_real_gl = new RealGLApi();
g_trace_gl = new TraceGLApi(g_real_gl);
@@ -195,8 +191,8 @@ void SetGLToRealGLApi() {
SetGLApi(g_gl);
}
-void InitializeGLExtensionBindingsGL(GLContext* context) {
- g_driver_gl.InitializeExtensions(context);
+void InitializeDynamicGLBindingsGL(GLContext* context) {
+ g_driver_gl.InitializeDynamic(context);
}
void InitializeDebugGLBindingsGL() {

Powered by Google App Engine
This is Rietveld 408576698