| 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 a11aa70db6da920a2e9833aaddcef0d0c28d29de..65dfe3518bcd10beac6fa1b45924b6608db0e268 100644
|
| --- a/gpu/command_buffer/service/feature_info.h
|
| +++ b/gpu/command_buffer/service/feature_info.h
|
| @@ -6,6 +6,7 @@
|
| #define GPU_COMMAND_BUFFER_SERVICE_FEATURE_INFO_H_
|
|
|
| #include <string>
|
| +#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
|
| #include "gpu/command_buffer/service/gles2_cmd_validation.h"
|
|
|
| namespace gpu {
|
| @@ -36,7 +37,8 @@ class FeatureInfo {
|
|
|
| // If allowed features = NULL or "*", all features are allowed. Otherwise
|
| // only features that match the strings in allowed_features are allowed.
|
| - bool Initialize(const char* allowed_features);
|
| + bool Initialize(const DisallowedExtensions& disallowed,
|
| + const char* allowed_features);
|
|
|
| // Turns on certain features if they can be turned on. NULL turns on
|
| // all available features.
|
| @@ -59,6 +61,8 @@ class FeatureInfo {
|
|
|
| Validators validators_;
|
|
|
| + DisallowedExtensions disallowed_extensions_;
|
| +
|
| // The extensions string returned by glGetString(GL_EXTENSIONS);
|
| std::string extensions_;
|
|
|
|
|