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

Unified Diff: trunk/src/ui/gl/gl_gl_api_implementation.cc

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, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ui/gl/gl_bindings.h ('k') | trunk/src/ui/gl/gl_implementation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/gl/gl_gl_api_implementation.cc
===================================================================
--- trunk/src/ui/gl/gl_gl_api_implementation.cc (revision 247809)
+++ trunk/src/ui/gl/gl_gl_api_implementation.cc (working copy)
@@ -146,35 +146,18 @@
} // anonymous namespace
-DriverGL::DriverGL() { ClearBindings(); }
-
void DriverGL::InitializeCustomDynamicBindings(GLContext* context) {
InitializeDynamicBindings(context);
-
- DCHECK(orig_fn.glTexImage2DFn == NULL);
- orig_fn.glTexImage2DFn = fn.glTexImage2DFn;
+ orig_fn = fn;
fn.glTexImage2DFn =
reinterpret_cast<glTexImage2DProc>(CustomTexImage2D);
-
- DCHECK(orig_fn.glTexSubImage2DFn == NULL);
- orig_fn.glTexSubImage2DFn = fn.glTexSubImage2DFn;
fn.glTexSubImage2DFn =
reinterpret_cast<glTexSubImage2DProc>(CustomTexSubImage2D);
-
- DCHECK(orig_fn.glTexStorage2DEXTFn == NULL);
- orig_fn.glTexStorage2DEXTFn = fn.glTexStorage2DEXTFn;
fn.glTexStorage2DEXTFn =
reinterpret_cast<glTexStorage2DEXTProc>(CustomTexStorage2DEXT);
-
- DCHECK(orig_fn.glRenderbufferStorageEXTFn == NULL);
- orig_fn.glRenderbufferStorageEXTFn = fn.glRenderbufferStorageEXTFn;
fn.glRenderbufferStorageEXTFn =
reinterpret_cast<glRenderbufferStorageEXTProc>(
CustomRenderbufferStorageEXT);
-
- DCHECK(orig_fn.glRenderbufferStorageMultisampleEXTFn == NULL);
- orig_fn.glRenderbufferStorageMultisampleEXTFn =
- fn.glRenderbufferStorageMultisampleEXTFn;
fn.glRenderbufferStorageMultisampleEXTFn =
reinterpret_cast<glRenderbufferStorageMultisampleEXTProc>(
CustomRenderbufferStorageMultisampleEXT);
« no previous file with comments | « trunk/src/ui/gl/gl_bindings.h ('k') | trunk/src/ui/gl/gl_implementation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698