| 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..68a47edf49b772ca2d7c77b236e1700c7a815f5e 100644
|
| --- a/gpu/command_buffer/service/feature_info.cc
|
| +++ b/gpu/command_buffer/service/feature_info.cc
|
| @@ -78,7 +78,9 @@ class ExtensionHelper {
|
| std::set<std::string> desired_extensions_;
|
| };
|
|
|
| -bool FeatureInfo::Initialize(const char* allowed_features) {
|
| +bool FeatureInfo::Initialize(const DisallowedExtensions& extensions,
|
| + const char* allowed_features) {
|
| + disallowed_extensions_ = extensions;
|
| AddFeatures(allowed_features);
|
| return true;
|
| }
|
| @@ -275,7 +277,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;
|
|
|