gpu/command_buffer/service/mocks.h - Issue 1273693002: command_buffer: Use GLSL core version that matches the OpenGL version

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1273693002: command_buffer: Use GLSL core version that matches the OpenGL version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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

« gpu/command_buffer/service/gles2_cmd_decoder.cc ('K') | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/shader_translator.h » ('j') | gpu/command_buffer/service/shader_translator_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/mocks.h

diff --git a/gpu/command_buffer/service/mocks.h b/gpu/command_buffer/service/mocks.h

index 02a08dbad53038dfeca630f8460ba75f51d9295a..f67e61f759d7405a6eda6975f10af345b7a4854e 100644

--- a/gpu/command_buffer/service/mocks.h

+++ b/gpu/command_buffer/service/mocks.h

@@ -89,12 +89,12 @@ class MockShaderTranslator : public ShaderTranslatorInterface {

public:

MockShaderTranslator();

- MOCK_METHOD5(Init, bool(

- sh::GLenum shader_type,

- ShShaderSpec shader_spec,

- const ShBuiltInResources* resources,

- GlslImplementationType glsl_implementation_type,

- ShCompileOptions driver_bug_workarounds));

+ MOCK_METHOD5(Init,

+ bool(sh::GLenum shader_type,

+ ShShaderSpec shader_spec,

+ const ShBuiltInResources* resources,

+ ShShaderOutput shader_output_language,

+ ShCompileOptions driver_bug_workarounds));

MOCK_CONST_METHOD8(Translate, bool(

const std::string& shader_source,

std::string* info_log,