Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Unified Diff: gpu/command_buffer/client/gles2_implementation_impl_autogen.h

Issue 2781863002: Revert of Update the passthrough command decoder to use the new CHROMIUM_copy_texture. (Closed)
Patch Set: Created 3 years, 9 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
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 db5d667d6069f29efdd5c93291e0ec8ccebd05d4..562b12f437f443a6c5ed068e0f21d9de33e2c423 100644
--- a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
@@ -3111,10 +3111,10 @@
CheckGLError();
}
void GLES2Implementation::CopyTextureCHROMIUM(
- GLuint source_id,
+ GLenum source_id,
GLint source_level,
GLenum dest_target,
- GLuint dest_id,
+ GLenum dest_id,
GLint dest_level,
GLint internalformat,
GLenum dest_type,
@@ -3123,11 +3123,12 @@
GLboolean unpack_unmultiply_alpha) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
GPU_CLIENT_LOG(
- "[" << GetLogPrefix() << "] glCopyTextureCHROMIUM(" << source_id << ", "
- << source_level << ", " << GLES2Util::GetStringEnum(dest_target)
- << ", " << dest_id << ", " << dest_level << ", " << internalformat
- << ", " << GLES2Util::GetStringPixelType(dest_type) << ", "
- << GLES2Util::GetStringBool(unpack_flip_y) << ", "
+ "[" << GetLogPrefix() << "] glCopyTextureCHROMIUM("
+ << GLES2Util::GetStringEnum(source_id) << ", " << source_level << ", "
+ << GLES2Util::GetStringEnum(dest_target) << ", "
+ << GLES2Util::GetStringEnum(dest_id) << ", " << dest_level << ", "
+ << internalformat << ", " << GLES2Util::GetStringPixelType(dest_type)
+ << ", " << GLES2Util::GetStringBool(unpack_flip_y) << ", "
<< GLES2Util::GetStringBool(unpack_premultiply_alpha) << ", "
<< GLES2Util::GetStringBool(unpack_unmultiply_alpha) << ")");
helper_->CopyTextureCHROMIUM(source_id, source_level, dest_target, dest_id,
@@ -3138,10 +3139,10 @@
}
void GLES2Implementation::CopySubTextureCHROMIUM(
- GLuint source_id,
+ GLenum source_id,
GLint source_level,
GLenum dest_target,
- GLuint dest_id,
+ GLenum dest_id,
GLint dest_level,
GLint xoffset,
GLint yoffset,
@@ -3154,11 +3155,12 @@
GLboolean unpack_unmultiply_alpha) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
GPU_CLIENT_LOG(
- "[" << GetLogPrefix() << "] glCopySubTextureCHROMIUM(" << source_id
- << ", " << source_level << ", "
- << GLES2Util::GetStringEnum(dest_target) << ", " << dest_id << ", "
- << dest_level << ", " << xoffset << ", " << yoffset << ", " << x
- << ", " << y << ", " << width << ", " << height << ", "
+ "[" << GetLogPrefix() << "] glCopySubTextureCHROMIUM("
+ << GLES2Util::GetStringEnum(source_id) << ", " << source_level << ", "
+ << GLES2Util::GetStringEnum(dest_target) << ", "
+ << GLES2Util::GetStringEnum(dest_id) << ", " << dest_level << ", "
+ << xoffset << ", " << yoffset << ", " << x << ", " << y << ", "
+ << width << ", " << height << ", "
<< GLES2Util::GetStringBool(unpack_flip_y) << ", "
<< GLES2Util::GetStringBool(unpack_premultiply_alpha) << ", "
<< GLES2Util::GetStringBool(unpack_unmultiply_alpha) << ")");
@@ -3177,11 +3179,12 @@
CheckGLError();
}
-void GLES2Implementation::CompressedCopyTextureCHROMIUM(GLuint source_id,
- GLuint dest_id) {
+void GLES2Implementation::CompressedCopyTextureCHROMIUM(GLenum source_id,
+ GLenum dest_id) {
GPU_CLIENT_SINGLE_THREAD_CHECK();
GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCompressedCopyTextureCHROMIUM("
- << source_id << ", " << dest_id << ")");
+ << GLES2Util::GetStringEnum(source_id) << ", "
+ << GLES2Util::GetStringEnum(dest_id) << ")");
helper_->CompressedCopyTextureCHROMIUM(source_id, dest_id);
CheckGLError();
}
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation_autogen.h ('k') | gpu/command_buffer/client/gles2_interface_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698