gpu/command_buffer/service/program_manager.cc - Issue 894093004: The Shader class now support deferred shader compiling.

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

Issue 894093004: The Shader class now support deferred shader compiling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Made RequestCompile() mandatory when using shader compiler Created 5 years, 10 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/memory_program_cache_unittest.cc ('k') | gpu/command_buffer/service/shader_manager.h » ('j') | gpu/command_buffer/service/shader_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/program_manager.cc

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

index d866504c5e950120760bd2d5707d8bd764a8aa29..1f6b2d49fc95933ade0c24e9c6dc0506d1a1e177 100644

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

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

@@ -562,12 +562,12 @@ bool Program::Link(ShaderManager* manager,

bool link = true;

ProgramCache* cache = manager_->program_cache_;

if (cache) {

- DCHECK(!attached_shaders_[0]->signature_source().empty() &&

- !attached_shaders_[1]->signature_source().empty());

+ DCHECK(!attached_shaders_[0]->last_compiled_source().empty() &&

+ !attached_shaders_[1]->last_compiled_source().empty());

ProgramCache::LinkedProgramStatus status = cache->GetLinkedProgramStatus(

- attached_shaders_[0]->signature_source(),

+ attached_shaders_[0]->last_compiled_source(),

vertex_translator,

- attached_shaders_[1]->signature_source(),

+ attached_shaders_[1]->last_compiled_source(),

fragment_translator,

&bind_attrib_location_map_);