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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc

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/service/gles2_cmd_decoder_passthrough_doers.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc
index f6e723d54e2bec72412c79a5bcc88c45bbf297e2..017402f43f91dcb60da2d93a6f2bfd908def27e3 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_passthrough_doers.cc
@@ -3249,10 +3249,10 @@
}
error::Error GLES2DecoderPassthroughImpl::DoCopyTextureCHROMIUM(
- 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,
@@ -3264,18 +3264,17 @@
}
glCopyTextureCHROMIUM(GetTextureServiceID(source_id, resources_, false),
- source_level, dest_target,
GetTextureServiceID(dest_id, resources_, false),
- dest_level, internalformat, dest_type, unpack_flip_y,
+ internalformat, dest_type, unpack_flip_y,
unpack_premultiply_alpha, unpack_unmultiply_alpha);
return error::kNoError;
}
error::Error GLES2DecoderPassthroughImpl::DoCopySubTextureCHROMIUM(
- 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,
@@ -3290,17 +3289,16 @@
return error::kUnknownCommand;
}
- glCopySubTextureCHROMIUM(
- GetTextureServiceID(source_id, resources_, false), source_level,
- dest_target, GetTextureServiceID(dest_id, resources_, false), dest_level,
- xoffset, yoffset, x, y, width, height, unpack_flip_y,
- unpack_premultiply_alpha, unpack_unmultiply_alpha);
+ glCopySubTextureCHROMIUM(GetTextureServiceID(source_id, resources_, false),
+ GetTextureServiceID(dest_id, resources_, false),
+ xoffset, yoffset, x, y, width, height, unpack_flip_y,
+ unpack_premultiply_alpha, unpack_unmultiply_alpha);
return error::kNoError;
}
error::Error GLES2DecoderPassthroughImpl::DoCompressedCopyTextureCHROMIUM(
- GLuint source_id,
- GLuint dest_id) {
+ GLenum source_id,
+ GLenum dest_id) {
if (!feature_info_->feature_flags().chromium_copy_compressed_texture) {
return error::kUnknownCommand;
}

Powered by Google App Engine
This is Rietveld 408576698