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

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

Issue 2610853005: Modify Copy{Sub}TextureCHROMIUM entry point to add level argument (Closed)
Patch Set: fix chromeos Created 3 years, 11 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.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 5739660354ae36f4a2fb7454d04734c2476d03e5..954d5fd8737705a8f8e195eadf77040a167a614e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -952,7 +952,9 @@ class GLES2DecoderImpl : public GLES2Decoder, public ErrorStateClient {
GLsizeiptr size);
void DoCopyTextureCHROMIUM(GLuint source_id,
+ GLint source_level,
GLuint dest_id,
+ GLint dest_level,
GLenum internal_format,
GLenum dest_type,
GLboolean unpack_flip_y,
@@ -960,7 +962,9 @@ class GLES2DecoderImpl : public GLES2Decoder, public ErrorStateClient {
GLboolean unpack_unmultiply_alpha);
void DoCopySubTextureCHROMIUM(GLuint source_id,
+ GLint source_level,
GLuint dest_id,
+ GLint dest_level,
GLint xoffset,
GLint yoffset,
GLint x,
@@ -16347,7 +16351,9 @@ bool GLES2DecoderImpl::ValidateCompressedCopyTextureCHROMIUM(
void GLES2DecoderImpl::DoCopyTextureCHROMIUM(
GLuint source_id,
+ GLint source_level,
GLuint dest_id,
+ GLint dest_level,
GLenum internal_format,
GLenum dest_type,
GLboolean unpack_flip_y,
@@ -16356,6 +16362,11 @@ void GLES2DecoderImpl::DoCopyTextureCHROMIUM(
TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoCopyTextureCHROMIUM");
static const char kFunctionName[] = "glCopyTextureCHROMIUM";
+ // TODO(qiankun.miao@intel.com): Remove this after level > 0 support is
+ // implemented. See: https://crbug.com/612542.
+ DCHECK(source_level == 0);
+ DCHECK(dest_level == 0);
+
TextureRef* source_texture_ref = GetTexture(source_id);
TextureRef* dest_texture_ref = GetTexture(dest_id);
@@ -16522,7 +16533,9 @@ void GLES2DecoderImpl::DoCopyTextureCHROMIUM(
void GLES2DecoderImpl::DoCopySubTextureCHROMIUM(
GLuint source_id,
+ GLint source_level,
GLuint dest_id,
+ GLint dest_level,
GLint xoffset,
GLint yoffset,
GLint x,
@@ -16534,6 +16547,11 @@ void GLES2DecoderImpl::DoCopySubTextureCHROMIUM(
GLboolean unpack_unmultiply_alpha) {
TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoCopySubTextureCHROMIUM");
+ // TODO(qiankun.miao@intel.com): Remove this after level > 0 support is
+ // implemented. See: https://crbug.com/612542.
+ DCHECK(source_level == 0);
+ DCHECK(dest_level == 0);
+
static const char kFunctionName[] = "glCopySubTextureCHROMIUM";
TextureRef* source_texture_ref = GetTexture(source_id);
TextureRef* dest_texture_ref = GetTexture(dest_id);
« no previous file with comments | « gpu/command_buffer/common/gles2_cmd_format_test_autogen.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698