Connect up --disable-gl-multisampling to command buffer

gpu/command_buffer/service/feature_info.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <set>
 #include <string>
 #include "app/gfx/gl/gl_implementation.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/GLES2/gles2_command_buffer.h"
@@ skipping 61 matching lines @@
   bool desire_all_features_;
 
   // Extensions that exist.
   std::set<std::string> have_extensions_;
 
   // Extensions that are desired but may not exist.
   std::set<std::string> desired_extensions_;
 };
 
 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;
+}
 
 void FeatureInfo::AddFeatures(const char* desired_features) {
   // Figure out what extensions to turn on.
   ExtensionHelper ext(
       reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)),
       desired_features);
 
   bool npot_ok = false;
 
   AddExtensionString("GL_CHROMIUM_map_sub");
@@ skipping 173 matching lines @@
 
   if (enable_texture_half_float) {
     validators_.pixel_type.AddValue(GL_HALF_FLOAT_OES);
     AddExtensionString("GL_OES_texture_half_float");
     if (enable_texture_half_float_linear) {
       AddExtensionString("GL_OES_texture_half_float_linear");
     }
   }
 
   // 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;
     validators_.frame_buffer_target.AddValue(GL_READ_FRAMEBUFFER_EXT);
     validators_.frame_buffer_target.AddValue(GL_DRAW_FRAMEBUFFER_EXT);
     validators_.g_l_state.AddValue(GL_READ_FRAMEBUFFER_BINDING_EXT);
     validators_.g_l_state.AddValue(GL_MAX_SAMPLES_EXT);
     validators_.render_buffer_parameter.AddValue(GL_RENDERBUFFER_SAMPLES_EXT);
     AddExtensionString("GL_CHROMIUM_framebuffer_multisample");
   }
@@ skipping 28 matching lines @@
   if (extensions_.find(str) == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu