Command buffer: generate correct GL error for invalid level for compressed texture

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 11099 matching lines @@
   if (!validators_->texture_3_d_target.IsValid(target)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_ENUM, "glCompressedTexSubImage3D", "target");
     return;
   }
   if (!validators_->compressed_texture_format.IsValid(format)) {
     LOCAL_SET_GL_ERROR_INVALID_ENUM(
         "glCompressedTexSubImage3D", format, "format");
     return;
   }
-  if (width < 0 || height < 0 || depth < 0) {
+  if (!texture_manager()->ValidForTarget(target, level, width, height, depth)) {
     LOCAL_SET_GL_ERROR(
-        GL_INVALID_VALUE, "glCompressedTexSubImage3D", "size < 0");
+        GL_INVALID_VALUE,
+        "glCompressedTexSubImage3D", "dimensions out of range");
     return;
   }
   if (image_size < 0) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glCompressedTexSubImage3D", "imageSize < 0");
     return;
   }
   TextureRef* texture_ref = texture_manager()->GetTextureInfoForTarget(
       &state_, target);
   if (!texture_ref) {
@@ skipping 193 matching lines @@
 void GLES2DecoderImpl::DoCompressedTexSubImage2D(
   GLenum target,
   GLint level,
   GLint xoffset,
   GLint yoffset,
   GLsizei width,
   GLsizei height,
   GLenum format,
   GLsizei image_size,
   const void * data) {
+  if (!texture_manager()->ValidForTarget(target, level, width, height, 1)) {

[Zhenyao Mo, 2016/03/04 17:39:58]

This needs to happen after GetTextureInfoForTarget() so we are sure target is
valid.

[yunchao, 2016/03/07 02:58:19]

Done.

+    LOCAL_SET_GL_ERROR(
+        GL_INVALID_VALUE,
+        "glCompressedTexSubImage2D", "dimensions out of range");
+    return;
+  }
   TextureRef* texture_ref = texture_manager()->GetTextureInfoForTarget(
       &state_, target);
   if (!texture_ref) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glCompressedTexSubImage2D", "unknown texture for target");
     return;
   }
   Texture* texture = texture_ref->texture();
   GLenum type = 0;
@@ skipping 4604 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu