gpu/command_buffer/service/memory_program_cache.cc - Issue 566023002: Clean up interfaces between Shader / ShaderTranslator / ANGLE side.

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/memory_program_cache.cc

Issue 566023002: Clean up interfaces between Shader / ShaderTranslator / ANGLE side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/gles2_cmd_decoder_unittest_base.cc ('k') | gpu/command_buffer/service/memory_program_cache_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/memory_program_cache.cc

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

index 1c087bb68b3ecede876743ea4b36b47fd790e270..87378aa8aa6161c5b56785cea2cf64bf040607ed 100644

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

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

@@ -130,12 +130,12 @@ ProgramCache::ProgramLoadResult MemoryProgramCache::LoadLinkedProgram(

const ShaderCacheCallback& shader_callback) {

char a_sha[kHashLength];

char b_sha[kHashLength];

- DCHECK(shader_a && shader_a->signature_source() &&

- shader_b && shader_b->signature_source());

+ DCHECK(shader_a && !shader_a->signature_source().empty() &&

+ shader_b && !shader_b->signature_source().empty());

ComputeShaderHash(

- *shader_a->signature_source(), translator_a, a_sha);

+ shader_a->signature_source(), translator_a, a_sha);

ComputeShaderHash(

- *shader_b->signature_source(), translator_b, b_sha);

+ shader_b->signature_source(), translator_b, b_sha);

char sha[kHashLength];

ComputeProgramHash(a_sha,

@@ -206,12 +206,12 @@ void MemoryProgramCache::SaveLinkedProgram(

char a_sha[kHashLength];

char b_sha[kHashLength];

- DCHECK(shader_a && shader_a->signature_source() &&

- shader_b && shader_b->signature_source());

+ DCHECK(shader_a && !shader_a->signature_source().empty() &&

+ shader_b && !shader_b->signature_source().empty());

ComputeShaderHash(

- *shader_a->signature_source(), translator_a, a_sha);

+ shader_a->signature_source(), translator_a, a_sha);

ComputeShaderHash(

- *shader_b->signature_source(), translator_b, b_sha);

+ shader_b->signature_source(), translator_b, b_sha);

char sha[kHashLength];

ComputeProgramHash(a_sha,