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

Unified Diff: ui/gl/gl_glx_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_glx_api_implementation.cc
diff --git a/ui/gl/gl_glx_api_implementation.cc b/ui/gl/gl_glx_api_implementation.cc
index cd38fd88806041066b3cd0c793afe5d72e9b1374..670e86c2ac62709721ef718ec1d8c3319660efda 100644
--- a/ui/gl/gl_glx_api_implementation.cc
+++ b/ui/gl/gl_glx_api_implementation.cc
@@ -16,6 +16,7 @@ void InitializeStaticGLBindingsGLX() {
}
g_real_glx->Initialize(&g_driver_glx);
g_current_glx_context = g_real_glx;
+ g_driver_glx.InitializeExtensionBindings(g_real_glx->GetEnabledExtensions());
}
void InitializeDebugGLBindingsGLX() {
@@ -58,6 +59,23 @@ void RealGLXApi::Initialize(DriverGLX* driver) {
InitializeBase(driver);
}
+std::set<std::string> RealGLXApi::GetEnabledExtensions() const {
+ std::set<std::string> enabled_extensions;
+
+ std::vector<std::string> platform_extensions_vec;
+ std::string platform_ext = DriverGLX::GetPlatformExtensions();
+ 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;
+}
+
TraceGLXApi::~TraceGLXApi() {
}

Powered by Google App Engine
This is Rietveld 408576698