gpu/ipc/service/stream_texture_android.cc - Issue 2014313002: StreamTextureImages can now override a Texture's service id

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/ipc/service/stream_texture_android.cc

Issue 2014313002: StreamTextureImages can now override a Texture's service id (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Partially implemented tying unowned id to StreamTextureImage Created 4 years, 7 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/texture_manager.cc ('K') | « gpu/command_buffer/service/texture_manager.cc ('k') | media/gpu/android_deferred_rendering_backing_strategy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/ipc/service/stream_texture_android.cc

diff --git a/gpu/ipc/service/stream_texture_android.cc b/gpu/ipc/service/stream_texture_android.cc

index ae9673e4e01e5ff9e7e7d6ac59101bb77ffc8845..5754ec8f6fc8580579272d4d660db177ad068a4b 100644

--- a/gpu/ipc/service/stream_texture_android.cc

+++ b/gpu/ipc/service/stream_texture_android.cc

@@ -51,7 +51,7 @@ bool StreamTexture::Create(GpuCommandBufferStub* owner_stub,

GL_UNSIGNED_BYTE, gfx::Rect(size));

texture_manager->SetLevelStreamTextureImage(

texture, GL_TEXTURE_EXTERNAL_OES, 0, gl_image.get(),

- gles2::Texture::UNBOUND);

+ gles2::Texture::UNBOUND, 0);

return true;

}

@@ -198,7 +198,7 @@ bool StreamTexture::CopyTexImage(unsigned target) {

// CopyTexImage() is called each time the surface texture is used for

// drawing.

texture->SetLevelStreamTextureImage(GL_TEXTURE_EXTERNAL_OES, 0, this,

- gles2::Texture::UNBOUND);

+ gles2::Texture::UNBOUND, 0);

}

return true;