Index: gpu/command_buffer/service/shader_translator.cc |
diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc |
index c3279e25ec6c501fb9830f08e76b8093a1103a04..5799014ae9a01857461279de30227002b7d040b4 100644 |
--- a/gpu/command_buffer/service/shader_translator.cc |
+++ b/gpu/command_buffer/service/shader_translator.cc |
@@ -203,13 +203,14 @@ bool ShaderTranslator::Translate(const char* shader) { |
std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation() |
const { |
- |
-#if ANGLE_SH_VERSION >= 123 |
+#if ANGLE_SH_VERSION >= 124 |
+ const size_t kNumIntFields = 23; |
+#elif ANGLE_SH_VERSION >= 123 |
const size_t kNumIntFields = 21; |
#elif ANGLE_SH_VERSION >= 122 |
const size_t kNumIntFields = 20; |
#else |
- const size_t kNumIntFields = 16; |
+ const size_t kNumIntFields = 18; |
#endif |
const size_t kNumEnumFields = 1; |
const size_t kNumFunctionPointerFields = 1; |
@@ -228,8 +229,7 @@ std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation() |
Fields_Have_Changed_In_ShBuiltInResource_So_Update_Below); |
return std::string( |
- ":CompileOptions:" + |
- base::IntToString(GetCompileOptions()) + |
+ ":CompileOptions:" + base::IntToString(GetCompileOptions()) + |
":MaxVertexAttribs:" + |
base::IntToString(compiler_options_.MaxVertexAttribs) + |
":MaxVertexUniformVectors:" + |
@@ -244,8 +244,9 @@ std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation() |
base::IntToString(compiler_options_.MaxTextureImageUnits) + |
":MaxFragmentUniformVectors:" + |
base::IntToString(compiler_options_.MaxFragmentUniformVectors) + |
- ":MaxDrawBuffers:" + |
- base::IntToString(compiler_options_.MaxDrawBuffers) + |
+ ":MaxDrawBuffers:" + base::IntToString(compiler_options_.MaxDrawBuffers) + |
+ ":MaxTextureCoords:" + |
+ base::IntToString(compiler_options_.MaxTextureCoords) + |
":OES_standard_derivatives:" + |
base::IntToString(compiler_options_.OES_standard_derivatives) + |
":OES_EGL_image_external:" + |
@@ -266,6 +267,10 @@ std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation() |
#if ANGLE_SH_VERSION >= 123 |
":EXT_shader_texture_lod:" + |
base::IntToString(compiler_options_.EXT_shader_texture_lod) + |
+#if ANGLE_SH_VERSION >= 124 |
+ ":CHROMIUM_path_rendering:" + |
+ base::IntToString(compiler_options_.CHROMIUM_path_rendering) + |
+#endif |
#endif |
":MaxVertexOutputVectors:" + |
base::IntToString(compiler_options_.MaxVertexOutputVectors) + |