WebGL 2: Fix bugs in negativetextureapi.html for Mac

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 951 matching lines @@
       GLint xoffset,
       GLint yoffset,
       GLint zoffset,
       GLsizei width,
       GLsizei height,
       GLsizei depth,
       GLenum format,
       GLsizei image_size,
       const void* data);
 
+  // Wrapper for CopyTexSubImage3D.
+  void DoCopyTexSubImage3D(
+      GLenum target,
+      GLint level,
+      GLint xoffset,
+      GLint yoffset,
+      GLint zoffset,
+      GLint x,
+      GLint y,
+      GLsizei width,
+      GLsizei height);
+
   // Validate if |format| is valid for CopyTex{Sub}Image functions.
   // If not, generate a GL error and return false.
   bool ValidateCopyTexFormat(const char* func_name, GLenum internal_format,
                              GLenum read_format, GLenum read_type);
 
   // Wrapper for CopyTexImage2D.
   void DoCopyTexImage2D(
       GLenum target,
       GLint level,
       GLenum internal_format,
@@ skipping 11594 matching lines @@
   } else {
     glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width,
                               height, depth, format, image_size, data);
   }
 
   // This may be a slow command.  Exit command processing to allow for
   // context preemption and GPU watchdog checks.
   ExitCommandProcessingEarly();
 }
 
+void GLES2DecoderImpl::DoCopyTexSubImage3D(
+    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+    GLint x, GLint y, GLsizei width, GLsizei height) {
+  if (!texture_manager()->ValidForTarget(target, level, width, height, 1)) {

[Zhenyao Mo, 2016/07/26 13:25:55]

Please look at CopyTexSubImage2D.  You will need more validation here, for
example, if the fbo is complete or not, if the src/dst formats are compatible,
etc.

[yunchao, 2016/07/26 13:30:50]

Acknowledged.

+    LOCAL_SET_GL_ERROR(
+        GL_INVALID_VALUE,
+        "glCopyTexSubImage3D", "dimensions out of range");

[Zhenyao Mo, 2016/07/26 13:25:55]

nit: define a const char* function_name, so you don't have to repeat this string
multiple times.

[yunchao, 2016/07/26 13:30:50]

Acknowledged.

+    return;
+  }
+  TextureRef* texture_ref = texture_manager()->GetTextureInfoForTarget(
+      &state_, target);
+  if (!texture_ref) {
+    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glCopyTexSubImage3D",
+        "unknown texture for target");
+    return;
+  }
+  Texture* texture = texture_ref->texture();
+  if (!texture->ValidForTexture(target, level, xoffset, yoffset, zoffset,
+                                width, height, 1)) {
+    LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCopyTexSubImage3D",
+        "bad dimensions");
+    return;
+  }
+  glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width,
+                       height);
+}
+
 error::Error GLES2DecoderImpl::HandleTexImage2D(uint32_t immediate_data_size,
                                                 const void* cmd_data) {
   const gles2::cmds::TexImage2D& c =
       *static_cast<const gles2::cmds::TexImage2D*>(cmd_data);
   TRACE_EVENT2("gpu", "GLES2DecoderImpl::HandleTexImage2D",
       "width", c.width, "height", c.height);
   // Set as failed for now, but if it successed, this will be set to not failed.
   texture_state_.tex_image_failed = true;
   GLenum target = static_cast<GLenum>(c.target);
   GLint level = static_cast<GLint>(c.level);
@@ skipping 5092 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