| Index: gpu/command_buffer/service/program_manager.h
|
| ===================================================================
|
| --- gpu/command_buffer/service/program_manager.h (revision 250177)
|
| +++ gpu/command_buffer/service/program_manager.h (working copy)
|
| @@ -20,6 +20,7 @@
|
| namespace gpu {
|
| namespace gles2 {
|
|
|
| +class FeatureInfo;
|
| class ProgramCache;
|
| class ProgramManager;
|
| class Shader;
|
| @@ -156,6 +157,7 @@
|
| bool Link(ShaderManager* manager,
|
| ShaderTranslator* vertex_translator,
|
| ShaderTranslator* fragment_shader,
|
| + FeatureInfo* feature_info,
|
| const ShaderCacheCallback& shader_callback);
|
|
|
| // Performs glValidateProgram and related activities.
|
| @@ -334,11 +336,6 @@
|
| // need to be shared by multiple GLES2Decoders.
|
| class GPU_EXPORT ProgramManager {
|
| public:
|
| - enum TranslatedShaderSourceType {
|
| - kANGLE,
|
| - kGL, // GL or GLES
|
| - };
|
| -
|
| explicit ProgramManager(ProgramCache* program_cache,
|
| uint32 max_varying_vectors);
|
| ~ProgramManager();
|
| @@ -378,10 +375,9 @@
|
|
|
| static int32 MakeFakeLocation(int32 index, int32 element);
|
|
|
| - void DoCompileShader(
|
| - Shader* shader,
|
| - ShaderTranslator* translator,
|
| - TranslatedShaderSourceType translated_shader_source_type);
|
| + void DoCompileShader(Shader* shader,
|
| + ShaderTranslator* translator,
|
| + FeatureInfo* feature_info);
|
|
|
| uint32 max_varying_vectors() const {
|
| return max_varying_vectors_;
|
| @@ -407,6 +403,8 @@
|
|
|
| bool have_context_;
|
|
|
| + bool disable_workarounds_;
|
| +
|
| // Used to clear uniforms.
|
| std::vector<uint8> zero_;
|
|
|
|
|