Chromium Code Reviews| Index: gpu/command_buffer/service/feature_info.h |
| diff --git a/gpu/command_buffer/service/feature_info.h b/gpu/command_buffer/service/feature_info.h |
| index 0f3f7094a68b6645de13b33166dd2c65d90b6d35..dafaedf93256957258f5f00a606ef4e8a16005aa 100644 |
| --- a/gpu/command_buffer/service/feature_info.h |
| +++ b/gpu/command_buffer/service/feature_info.h |
| @@ -110,8 +110,11 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> { |
| 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_; |
| @@ -162,6 +165,8 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> { |
| DisallowedFeatures disallowed_features_; |
| + ContextType context_type_; |
|
Zhenyao Mo
2015/09/30 23:50:13
If you define this here, then remove the one in gl
Zhenyao Mo
2015/09/30 23:51:37
Actually you can also remove it from the context_g
ericrk
2015/10/01 17:13:11
Done.
|
| + |
| // The extensions string returned by glGetString(GL_EXTENSIONS); |
| std::string extensions_; |