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

Unified Diff: ui/gl/gl_gl_api_implementation.cc

Issue 1203513004: Respect the disabled extension list during binding initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split extension binding loading from static binding loading; pass enabled extensions Created 5 years, 6 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
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 a8d4dbe0c0de5ecda49b59c5f38fc26a214ec453..f7f7cf51901db0af56d544e90d5f06f675164ee3 100644
--- a/ui/gl/gl_gl_api_implementation.cc
+++ b/ui/gl/gl_gl_api_implementation.cc
@@ -211,7 +211,8 @@ static void GL_BINDING_CALL CustomRenderbufferStorageMultisampleEXT(
} // anonymous namespace
void DriverGL::InitializeCustomDynamicBindings(GLContext* context) {
- InitializeDynamicBindings(context);
+ InitializeExtensionBindings(context,
+ g_real_gl->GetEnabledExtensions(context));
DCHECK(orig_fn.glTexImage2DFn == NULL);
orig_fn.glTexImage2DFn = fn.glTexImage2DFn;
@@ -450,6 +451,24 @@ const GLubyte* RealGLApi::glGetStringiFn(GLenum name, GLuint index) {
return GLApiBase::glGetStringiFn(name, index);
}
+std::set<std::string> RealGLApi::GetEnabledExtensions(
+ GLContext* context) const {
+ std::set<std::string> enabled_extensions;
+
+ std::vector<std::string> platform_extensions_vec;
+ std::string platform_ext = context->GetExtensions();
+ base::SplitString(platform_ext, ' ', &platform_extensions_vec);
+
+ enabled_extensions.insert(platform_extensions_vec.begin(),
+ platform_extensions_vec.end());
+
+ for (auto ext : disabled_exts_) {
+ enabled_extensions.erase(ext);
+ }
+
+ return enabled_extensions;
+}
+
void RealGLApi::glFlushFn() {
GLApiBase::glFlushFn();
}

Powered by Google App Engine
This is Rietveld 408576698