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 3b45922c697f3ca0a0dc16125a005582064c124a..d924fad27082ad97adc488397a8e7dbd400adc90 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc |
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc |
@@ -13203,6 +13203,13 @@ void GLES2DecoderImpl::DoCopySubTextureCHROMIUM( |
return; |
} |
+ if (!source_texture->ValidForTexture(source_texture->target(), 0, x, y, 0, |
+ width, height, 1)) { |
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCopySubTextureCHROMIUM", |
+ "source texture bad dimensions."); |
+ return; |
+ } |
+ |
// Check that this type of texture is allowed. |
if (!texture_manager()->ValidForTarget(source_texture->target(), 0, |
source_width, source_height, 1)) { |
@@ -13216,12 +13223,6 @@ void GLES2DecoderImpl::DoCopySubTextureCHROMIUM( |
GLenum source_internal_format = 0; |
source_texture->GetLevelType(source_texture->target(), 0, &source_type, |
&source_internal_format); |
- if (!source_texture->ValidForTexture(source_texture->target(), 0, x, y, 0, |
- width, height, 1)) { |
- LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCopySubTextureCHROMIUM", |
- "source texture bad dimensions."); |
- return; |
- } |
GLenum dest_type = 0; |
GLenum dest_internal_format = 0; |
@@ -13525,6 +13526,13 @@ void GLES2DecoderImpl::DoCompressedCopySubTextureCHROMIUM(GLenum target, |
return; |
} |
+ if (!source_texture->ValidForTexture(source_texture->target(), 0, x, y, 0, |
+ width, height, 1)) { |
+ LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedCopySubTextureCHROMIUM", |
+ "source texture bad dimensions."); |
+ return; |
+ } |
+ |
// Check that this type of texture is allowed. |
if (!texture_manager()->ValidForTarget(source_texture->target(), 0, |
source_width, source_height, 1)) { |
@@ -13538,12 +13546,6 @@ void GLES2DecoderImpl::DoCompressedCopySubTextureCHROMIUM(GLenum target, |
GLenum source_internal_format = 0; |
source_texture->GetLevelType(source_texture->target(), 0, &source_type, |
&source_internal_format); |
- if (!source_texture->ValidForTexture(source_texture->target(), 0, x, y, 0, |
- width, height, 1)) { |
- LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedCopySubTextureCHROMIUM", |
- "source texture bad dimensions."); |
- return; |
- } |
GLenum dest_type = 0; |
GLenum dest_internal_format = 0; |