Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / gpu / command_buffer / service / shader_translator_cache.h

diff --git a/src/gpu/command_buffer/service/shader_translator_cache.h b/src/gpu/command_buffer/service/shader_translator_cache.h
index e5f1ae0..2a272d1 100644 (file)
--- a/src/gpu/command_buffer/service/shader_translator_cache.h
+++ b/src/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