diff options
| author | jmadill@chromium.org <jmadill@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 17:27:47 +0000 |
|---|---|---|
| committer | jmadill@chromium.org <jmadill@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-01 17:27:47 +0000 |
| commit | aef1248e6ff6e5e10f294cc39a90d9e4cf4b62af (patch) | |
| tree | aa21434220b51a7b8c2a050a4a57441b89b22970 /gpu | |
| parent | 5d33ee30eae8fedec90f72ef8c17ae90bbff2524 (diff) | |
| download | chromium_src-aef1248e6ff6e5e10f294cc39a90d9e4cf4b62af.zip chromium_src-aef1248e6ff6e5e10f294cc39a90d9e4cf4b62af.tar.gz chromium_src-aef1248e6ff6e5e10f294cc39a90d9e4cf4b62af.tar.bz2 | |
Update fields for translator resources.
Handle both the new translator header and the old until we converge on
the new ES3 ANGLE branch.
BUG=356760
Review URL: https://codereview.chromium.org/217183002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/shader_translator.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/shader_translator.cc b/gpu/command_buffer/service/shader_translator.cc index 333e2c6..abf4c3e 100644 --- a/gpu/command_buffer/service/shader_translator.cc +++ b/gpu/command_buffer/service/shader_translator.cc @@ -205,7 +205,12 @@ bool ShaderTranslator::Translate(const char* shader) { std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation() const { + +#if 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 { @@ -256,7 +261,19 @@ std::string ShaderTranslator::GetStringForOptionsThatWouldEffectCompilation() ":MaxCallStackDepth:" + base::IntToString(compiler_options_.MaxCallStackDepth) + ":EXT_frag_depth:" + +#if ANGLE_SH_VERSION >= 122 + base::IntToString(compiler_options_.EXT_frag_depth) + + ":MaxVertexOutputVectors:" + + base::IntToString(compiler_options_.MaxVertexOutputVectors) + + ":MaxFragmentInputVectors:" + + base::IntToString(compiler_options_.MaxFragmentInputVectors) + + ":MinProgramTexelOffset:" + + base::IntToString(compiler_options_.MinProgramTexelOffset) + + ":MaxProgramTexelOffset:" + + base::IntToString(compiler_options_.MaxProgramTexelOffset)); +#else base::IntToString(compiler_options_.EXT_frag_depth)); +#endif } const char* ShaderTranslator::translated_shader() const { |