gpu/command_buffer/client/gles2_implementation_impl_autogen.h - Issue 13613006: Add a new parameter dest_type to the GL_CHROMIUM_copy_texture extension.

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/client/gles2_implementation_impl_autogen.h

Issue 13613006: Add a new parameter dest_type to the GL_CHROMIUM_copy_texture extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase the patch and solve the merge conflict issue Created 7 years, 8 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/client/gles2_implementation_autogen.h ('k') | gpu/command_buffer/client/gles2_implementation_unittest_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/client/gles2_implementation_impl_autogen.h

diff --git a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h

index 9ddcd08934960d96ee1995333810356e9c41a986..743f5e9a0ca6e8957390755d90009eddefb53436 100644

--- a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h

+++ b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h

@@ -1630,11 +1630,11 @@ void GLES2Implementation::TexImageIOSurface2DCHROMIUM(

void GLES2Implementation::CopyTextureCHROMIUM(

GLenum target, GLenum source_id, GLenum dest_id, GLint level,

- GLint internalformat) {

+ GLint internalformat, GLenum dest_type) {

GPU_CLIENT_SINGLE_THREAD_CHECK();

- GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCopyTextureCHROMIUM(" << GLES2Util::GetStringEnum(target) << ", " << GLES2Util::GetStringEnum(source_id) << ", " << GLES2Util::GetStringEnum(dest_id) << ", " << level << ", " << internalformat << ")"); // NOLINT

+ GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCopyTextureCHROMIUM(" << GLES2Util::GetStringEnum(target) << ", " << GLES2Util::GetStringEnum(source_id) << ", " << GLES2Util::GetStringEnum(dest_id) << ", " << level << ", " << internalformat << ", " << GLES2Util::GetStringPixelType(dest_type) << ")"); // NOLINT

helper_->CopyTextureCHROMIUM(

- target, source_id, dest_id, level, internalformat);

+ target, source_id, dest_id, level, internalformat, dest_type);

CheckGLError();

}