gpu/command_buffer/service/mailbox_manager_sync.cc - Issue 1418483003: Revert of ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder.

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

Issue 1418483003: Revert of ui: Move GLImage::BindTexImage fallback from GLImage implementations to GLES2CmdDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: gpu/command_buffer/service/mailbox_manager_sync.cc

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

index a48d032e6e2a28b18334ee6f2445c63cde509f12..7463f92bfdc78435ed2e7de8986c56522cc8b6a6 100644

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

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

@@ -273,7 +273,7 @@

if (SkipTextureWorkarounds(texture))

return;

- gfx::GLImage* image = texture->GetLevelImage(texture->target(), 0);

+ gfx::GLImage* gl_image = texture->GetLevelImage(texture->target(), 0);

TextureGroup* group = group_ref->group.get();

const TextureDefinition& definition = group->GetDefinition();

scoped_refptr<NativeImageBuffer> image_buffer = definition.image();

@@ -287,14 +287,14 @@

if (definition.Matches(texture))

return;

- DCHECK_IMPLIES(image, image_buffer.get());

- if (image && !image_buffer->IsClient(image)) {

+ DCHECK_IMPLIES(gl_image, image_buffer.get());

+ if (gl_image && !image_buffer->IsClient(gl_image)) {

LOG(ERROR) << "MailboxSync: Incompatible attachment";

return;

}

group->SetDefinition(TextureDefinition(texture, ++group_ref->version,

- image ? image_buffer : NULL));

+ gl_image ? image_buffer : NULL));

}

void MailboxManagerSync::PushTextureUpdates(const SyncToken& token) {