Chromium Code Reviews| Index: gpu/command_buffer/service/shader_translator.h |
| diff --git a/gpu/command_buffer/service/shader_translator.h b/gpu/command_buffer/service/shader_translator.h |
| index 268a1554d0937f68782b930e4a566d5453e3bea5..87974733e2f4216a24590d2bf5025a82d71352de 100644 |
| --- a/gpu/command_buffer/service/shader_translator.h |
| +++ b/gpu/command_buffer/service/shader_translator.h |
| @@ -27,11 +27,6 @@ class ShaderTranslatorInterface { |
| kGlslES |
| }; |
| - enum GlslBuiltInFunctionBehavior { |
| - kGlslBuiltInFunctionOriginal, |
| - kGlslBuiltInFunctionEmulated |
| - }; |
| - |
| struct VariableInfo { |
| VariableInfo() |
| : type(0), |
| @@ -75,7 +70,7 @@ class ShaderTranslatorInterface { |
| ShShaderSpec shader_spec, |
| const ShBuiltInResources* resources, |
| GlslImplementationType glsl_implementation_type, |
| - GlslBuiltInFunctionBehavior glsl_built_in_function_behavior) = 0; |
| + int driver_bug_workarounds) = 0; |
| // Translates the given shader source. |
| // Returns true if translation is successful, false otherwise. |
| @@ -125,7 +120,7 @@ class GPU_EXPORT ShaderTranslator |
| ShShaderSpec shader_spec, |
| const ShBuiltInResources* resources, |
| GlslImplementationType glsl_implementation_type, |
| - GlslBuiltInFunctionBehavior glsl_built_in_function_behavior) OVERRIDE; |
| + int driver_bug_workarounds) OVERRIDE; |
|
Ken Russell (switch to Gerrit)
2013/09/06 21:57:27
Could you please use the ShCompileOptions enum typ
|
| // Overridden from ShaderTranslatorInterface. |
| virtual bool Translate(const char* shader) OVERRIDE; |
| @@ -162,7 +157,7 @@ class GPU_EXPORT ShaderTranslator |
| VariableMap varying_map_; |
| NameMap name_map_; |
| bool implementation_is_glsl_es_; |
| - bool needs_built_in_function_emulation_; |
| + int driver_bug_workarounds_; |
| ObserverList<DestructionObserver> destruction_observers_; |
| DISALLOW_COPY_AND_ASSIGN(ShaderTranslator); |