Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: gpu/command_buffer/service/shader_translator_cache.h

Issue 552013007: Remove outdated ANGLE_SH_VERSION if-def stuff. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « gpu/command_buffer/service/shader_translator.cc ('k') | gpu/command_buffer/service/shader_translator_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698