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

Unified Diff: gpu/command_buffer/service/feature_info.cc

Issue 6623063: Connect up --disable-gl-multisampling to command buffer (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix style. Created 9 years, 9 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 | « gpu/command_buffer/service/feature_info.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/feature_info.cc
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
index ad85737cea5468da3f0e3b6b364ea6a53b859be8..7a38bf35fb06cb3e88aeef97ab955043409a195f 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -79,6 +79,14 @@ class ExtensionHelper {
};
bool FeatureInfo::Initialize(const char* allowed_features) {
+ disallowed_extensions_ = DisallowedExtensions();
+ AddFeatures(allowed_features);
+ return true;
+}
+
+bool FeatureInfo::Initialize(const DisallowedExtensions& disallowed_extensions,
+ const char* allowed_features) {
+ disallowed_extensions_ = disallowed_extensions;
AddFeatures(allowed_features);
return true;
}
@@ -275,7 +283,8 @@ void FeatureInfo::AddFeatures(const char* desired_features) {
}
// Check for multisample support
- if (ext.Desire("GL_CHROMIUM_framebuffer_multisample") &&
+ if (!disallowed_extensions_.multisampling &&
+ ext.Desire("GL_CHROMIUM_framebuffer_multisample") &&
(ext.Have("GL_EXT_framebuffer_multisample") ||
ext.Have("GL_ANGLE_framebuffer_multisample"))) {
feature_flags_.chromium_framebuffer_multisample = true;
« no previous file with comments | « gpu/command_buffer/service/feature_info.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698