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; |