gpu/command_buffer/service/shader_translator_cache.cc - 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.cc

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: fix android compile problem and rebase 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

« no previous file with comments | « gpu/command_buffer/service/shader_translator_cache.h ('k') | gpu/command_buffer/service/shader_translator_cache_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/shader_translator_cache.cc

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

index 631a88e4142128ad200f827832a720950af20f8f..f78039fcac25d72c900bc2360ceb668fe669abb2 100644

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

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

@@ -31,13 +31,10 @@ scoped_refptr<ShaderTranslator> ShaderTranslatorCache::GetTranslator(

sh::GLenum shader_type,

ShShaderSpec shader_spec,

const ShBuiltInResources* resources,

- ShaderTranslatorInterface::GlslImplementationType

- glsl_implementation_type,

+ ShShaderOutput shader_output_language,

ShCompileOptions driver_bug_workarounds) {

- ShaderTranslatorInitParams params(shader_type,

- shader_spec,

- *resources,

- glsl_implementation_type,

+ ShaderTranslatorInitParams params(shader_type, shader_spec, *resources,

+ shader_output_language,

driver_bug_workarounds);

Cache::iterator it = cache_.find(params);

@@ -46,8 +43,7 @@ scoped_refptr<ShaderTranslator> ShaderTranslatorCache::GetTranslator(

ShaderTranslator* translator = new ShaderTranslator();

if (translator->Init(shader_type, shader_spec, resources,

- glsl_implementation_type,

- driver_bug_workarounds)) {

+ shader_output_language, driver_bug_workarounds)) {

cache_[params] = translator;

translator->AddDestructionObserver(this);

return translator;