Blacklist MSAA for GPU Raster on Intel GPUs

gpu/command_buffer/service/feature_info.h

 // Copyright (c) 2012 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_FEATURE_INFO_H_
 #define GPU_COMMAND_BUFFER_SERVICE_FEATURE_INFO_H_
 
 #include <string>
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 92 matching lines @@
     GLint max_copy_texture_chromium_size;
   };
 
   // Constructor with workarounds taken from the current process's CommandLine
   FeatureInfo();
 
   // Constructor with workarounds taken from |command_line|
   FeatureInfo(const base::CommandLine& command_line);
 
   // Initializes the feature information. Needs a current GL context.
-  bool Initialize();
-  bool Initialize(const DisallowedFeatures& disallowed_features);
+  bool Initialize(ContextType context_type,
+                  const DisallowedFeatures& disallowed_features);
+
+  // Helper that defaults to no disallowed features and a GLES2 context.
+  bool InitializeForTesting();
 
   const Validators* validators() const {
     return &validators_;
   }
 
   const std::string& extensions() const {
     return extensions_;
   }
 
   const FeatureFlags& feature_flags() const {
@@ skipping 30 matching lines @@
   ~FeatureInfo();
 
   void AddExtensionString(const char* s);
   void InitializeBasicState(const base::CommandLine* command_line);
   void InitializeFeatures();
 
   Validators validators_;
 
   DisallowedFeatures disallowed_features_;
 
+  ContextType context_type_;

[Zhenyao Mo, 2015/09/30 23:50:13]

If you define this here, then remove the one in gles2_cmd_decoder. You will need
to expose with a getter function here, so decoder can query it.

[Zhenyao Mo, 2015/09/30 23:51:37]

Actually you can also remove it from the context_group.  So we have consistency
in the information and much easier to maintain.

[ericrk, 2015/10/01 17:13:11]

Done.

+
   // The extensions string returned by glGetString(GL_EXTENSIONS);
   std::string extensions_;
 
   // Flags for some features
   FeatureFlags feature_flags_;
 
   // Flags for Workarounds.
   Workarounds workarounds_;
 
   // Whether the command line switch kEnableUnsafeES3APIs is passed in.
@@ skipping 10 matching lines @@
   bool disable_shader_translator_;
   scoped_ptr<gfx::GLVersionInfo> gl_version_info_;
 
   DISALLOW_COPY_AND_ASSIGN(FeatureInfo);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FEATURE_INFO_H_