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

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

Issue 373833002: Fix gpu_unittests for new Shader Translator header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: No change Created 6 years, 5 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/mocks.h
diff --git a/gpu/command_buffer/service/mocks.h b/gpu/command_buffer/service/mocks.h
index b64305149e7b518a79a86fa46c569da4696bccfb..6cdeb09982aa4fd81361b64ecd01636f799688e3 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*());

Powered by Google App Engine
This is Rietveld 408576698