Moves responsibility for shader resource string generation to ANGLE.

gpu/command_buffer/service/shader_translator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/shader_translator.h"
 
 #include <string.h>
 #include <algorithm>
 
 #include "base/at_exit.h"
@@ skipping 183 matching lines @@
   if (info_log_len > 1) {
     info_log_.reset(new char[info_log_len]);
     ShGetInfoLog(compiler_, info_log_.get());
   } else {
     info_log_.reset();
   }
 
   return success;
 }
 
-std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation()
+std::string ShaderTranslator::GetStringForOptionsThatWouldAffectCompilation()
     const {
+#if ANGLE_SH_VERSION >= 124
+  DCHECK(compiler_ != NULL);
 
+  ANGLEGetInfoType resource_len = 0;
+  ShGetInfo(compiler_, SH_RESOURCES_STRING_LENGTH, &resource_len);
+  DCHECK(resource_len > 1);
+  scoped_ptr<char[]> resource_str(new char[resource_len]);
+
+  ShGetBuiltInResourcesString(compiler_, resource_len, resource_str.get());
+
+  return std::string(":CompileOptions:" +
+         base::IntToString(GetCompileOptions())) +
+         std::string(resource_str.get());
+#else
 #if 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;
 #endif
   const size_t kNumEnumFields = 1;
   const size_t kNumFunctionPointerFields = 1;
   struct MustMatchShBuiltInResource {
@@ skipping 54 matching lines @@
       base::IntToString(compiler_options_.MaxVertexOutputVectors) +
       ":MaxFragmentInputVectors:" +
       base::IntToString(compiler_options_.MaxFragmentInputVectors) +
       ":MinProgramTexelOffset:" +
       base::IntToString(compiler_options_.MinProgramTexelOffset) +
       ":MaxProgramTexelOffset:" +
       base::IntToString(compiler_options_.MaxProgramTexelOffset));
 #else   // ANGLE_SH_VERSION < 122
       base::IntToString(compiler_options_.EXT_frag_depth));
 #endif
+#endif
 }
 
 const char* ShaderTranslator::translated_shader() const {
   return translated_shader_.get();
 }
 
 const char* ShaderTranslator::info_log() const {
   return info_log_.get();
 }
 
@@ skipping 41 matching lines @@
   info_log_.reset();
   attrib_map_.clear();
   uniform_map_.clear();
   varying_map_.clear();
   name_map_.clear();
 }
 
 }  // namespace gles2
 }  // namespace gpu