gpu/command_buffer/service/shader_translator_cache.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/shader_translator_cache.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/shader_translator.cc ('k') | gpu/command_buffer/service/shader_translator_cache.cc » ('j') | gpu/command_buffer/service/shader_translator_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/shader_translator_cache.h

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

index 6b0b1a57ef35cfc3a727a8962db1af05803dbae3..471b081ac728cf4c7585bfe254abbcb36bd14c58 100644

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

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

@@ -35,8 +35,7 @@ class GPU_EXPORT ShaderTranslatorCache

sh::GLenum shader_type,

ShShaderSpec shader_spec,

const ShBuiltInResources* resources,

- ShaderTranslatorInterface::GlslImplementationType

- glsl_implementation_type,

+ ShShaderOutput shader_output_language,

ShCompileOptions driver_bug_workarounds);

private:

@@ -49,21 +48,19 @@ class GPU_EXPORT ShaderTranslatorCache

sh::GLenum shader_type;

ShShaderSpec shader_spec;

ShBuiltInResources resources;

- ShaderTranslatorInterface::GlslImplementationType

- glsl_implementation_type;

+ ShShaderOutput shader_output_language;

ShCompileOptions driver_bug_workarounds;

ShaderTranslatorInitParams(sh::GLenum shader_type,

ShShaderSpec shader_spec,

const ShBuiltInResources& resources,

- ShaderTranslatorInterface::GlslImplementationType

- glsl_implementation_type,

+ ShShaderOutput shader_output_language,

ShCompileOptions driver_bug_workarounds) {

memset(this, 0, sizeof(*this));

this->shader_type = shader_type;

this->shader_spec = shader_spec;

this->resources = resources;

- this->glsl_implementation_type = glsl_implementation_type;

+ this->shader_output_language = shader_output_language;

this->driver_bug_workarounds = driver_bug_workarounds;

}