| Index: gpu/command_buffer/service/shader_translator_cache.h
|
| diff --git a/gpu/command_buffer/service/shader_translator_cache.h b/gpu/command_buffer/service/shader_translator_cache.h
|
| index e5f1ae03575f176ac4068f3622fc199a892283fd..2a272d11539b8fa27a7f6bc5c9019be4f5716fa0 100644
|
| --- a/gpu/command_buffer/service/shader_translator_cache.h
|
| +++ b/gpu/command_buffer/service/shader_translator_cache.h
|
| @@ -32,11 +32,7 @@ class GPU_EXPORT ShaderTranslatorCache
|
| virtual void OnDestruct(ShaderTranslator* translator) OVERRIDE;
|
|
|
| scoped_refptr<ShaderTranslator> GetTranslator(
|
| -#if (ANGLE_SH_VERSION >= 126)
|
| sh::GLenum shader_type,
|
| -#else
|
| - ShShaderType shader_type,
|
| -#endif
|
| ShShaderSpec shader_spec,
|
| const ShBuiltInResources* resources,
|
| ShaderTranslatorInterface::GlslImplementationType
|
| @@ -49,11 +45,7 @@ class GPU_EXPORT ShaderTranslatorCache
|
|
|
| // Parameters passed into ShaderTranslator::Init
|
| struct ShaderTranslatorInitParams {
|
| -#if (ANGLE_SH_VERSION >= 126)
|
| sh::GLenum shader_type;
|
| -#else
|
| - ShShaderType shader_type;
|
| -#endif
|
| ShShaderSpec shader_spec;
|
| ShBuiltInResources resources;
|
| ShaderTranslatorInterface::GlslImplementationType
|
| @@ -61,11 +53,7 @@ class GPU_EXPORT ShaderTranslatorCache
|
| ShCompileOptions driver_bug_workarounds;
|
|
|
| ShaderTranslatorInitParams(
|
| -#if (ANGLE_SH_VERSION >= 126)
|
| sh::GLenum shader_type,
|
| -#else
|
| - ShShaderType shader_type,
|
| -#endif
|
| ShShaderSpec shader_spec,
|
| const ShBuiltInResources& resources,
|
| ShaderTranslatorInterface::GlslImplementationType
|
|
|