diff options
| author | jmadill@chromium.org <jmadill@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 14:05:17 +0000 |
|---|---|---|
| committer | jmadill@chromium.org <jmadill@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 14:05:17 +0000 |
| commit | 44c8cc8bc2a354669c80714ad1426d2a2156843c (patch) | |
| tree | 1232925689ab7502e5e95ccb761cf764b444ef60 /gpu | |
| parent | d89b2a3bc73237eff9ed933e590bc8c042bea0f9 (diff) | |
| download | chromium_src-44c8cc8bc2a354669c80714ad1426d2a2156843c.zip chromium_src-44c8cc8bc2a354669c80714ad1426d2a2156843c.tar.gz chromium_src-44c8cc8bc2a354669c80714ad1426d2a2156843c.tar.bz2 | |
Fix gpu_unittests for new Shader Translator header.
BUG=389276
Review URL: https://codereview.chromium.org/373833002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/mocks.h | 9 | ||||
| -rw-r--r-- | gpu/command_buffer/service/program_manager_unittest.cc | 10 | ||||
| -rw-r--r-- | gpu/command_buffer/service/shader_translator_unittest.cc | 11 |
3 files changed, 30 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/mocks.h b/gpu/command_buffer/service/mocks.h index b643051..6cdeb09 100644 --- a/gpu/command_buffer/service/mocks.h +++ b/gpu/command_buffer/service/mocks.h @@ -79,12 +79,21 @@ class MockShaderTranslator : public ShaderTranslatorInterface { MockShaderTranslator(); virtual ~MockShaderTranslator(); +#if (ANGLE_SH_VERSION >= 126) + MOCK_METHOD5(Init, bool( + sh::GLenum shader_type, + ShShaderSpec shader_spec, + const ShBuiltInResources* resources, + GlslImplementationType glsl_implementation_type, + ShCompileOptions driver_bug_workarounds)); +#else MOCK_METHOD5(Init, bool( ShShaderType shader_type, ShShaderSpec shader_spec, const ShBuiltInResources* resources, GlslImplementationType glsl_implementation_type, ShCompileOptions driver_bug_workarounds)); +#endif MOCK_METHOD1(Translate, bool(const char* shader)); MOCK_CONST_METHOD0(translated_shader, const char*()); MOCK_CONST_METHOD0(info_log, const char*()); diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc index 3264861..8c18b8f 100644 --- a/gpu/command_buffer/service/program_manager_unittest.cc +++ b/gpu/command_buffer/service/program_manager_unittest.cc @@ -31,6 +31,16 @@ using ::testing::SetArrayArgument; using ::testing::SetArgumentPointee; using ::testing::StrEq; +// ANGLE now uses GLenum values directory for types +// TODO(jmadill): Delete these defines when the ANGLE +// roll reliably passes translator version 126 +#if (ANGLE_SH_VERSION >= 126) +#define SH_FLOAT GL_FLOAT +#define SH_FLOAT_VEC2 GL_FLOAT_VEC2 +#define SH_FLOAT_VEC3 GL_FLOAT_VEC3 +#define SH_FLOAT_VEC4 GL_FLOAT_VEC4 +#endif + namespace gpu { namespace gles2 { diff --git a/gpu/command_buffer/service/shader_translator_unittest.cc b/gpu/command_buffer/service/shader_translator_unittest.cc index 233b412..fe6eef1 100644 --- a/gpu/command_buffer/service/shader_translator_unittest.cc +++ b/gpu/command_buffer/service/shader_translator_unittest.cc @@ -2,9 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <GLES2/gl2.h> + #include "gpu/command_buffer/service/shader_translator.h" #include "testing/gtest/include/gtest/gtest.h" +// The ANGLE shader translator now uses native GLenums +// TODO(jmadill): delete these defines when the ANGLE +// roll reliably passes translator version 126 +#if (ANGLE_SH_VERSION >= 126) +#define SH_VERTEX_SHADER GL_VERTEX_SHADER +#define SH_FRAGMENT_SHADER GL_FRAGMENT_SHADER +#define SH_FLOAT_VEC4 GL_FLOAT_VEC4 +#endif + namespace gpu { namespace gles2 { |