WebGL 2: Fix bugs in negativetextureapi.html for Mac

gpu/command_buffer/service/gles2_cmd_decoder.cc

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 953c4741b012a8758e8fcd25144d3c28e5920f47..109b64ff095598dbcffd6adf0bbbddc95d1d6589 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1007,6 +1007,18 @@ class GLES2DecoderImpl : public GLES2Decoder, public ErrorStateClient {
       GLsizei width,
       GLsizei height);
 
+  // Wrapper for CopyTexSubImage3D.
+  void DoCopyTexSubImage3D(
+      GLenum target,
+      GLint level,
+      GLint xoffset,
+      GLint yoffset,
+      GLint zoffset,
+      GLint x,
+      GLint y,
+      GLsizei width,
+      GLsizei height);
+
   void DoCopyTextureCHROMIUM(GLuint source_id,
                              GLuint dest_id,
                              GLenum internal_format,
@@ -13019,7 +13031,7 @@ void GLES2DecoderImpl::DoCopyTexImage2D(
       CopyTexImageResourceManager::CopyTexImageRequiresBlit(feature_info_.get(),
                                                             format);
   if (requires_luma_blit &&
-      !InitializeCopyTexImageBlitter("glCopyTexSubImage2D")) {
+      !InitializeCopyTexImageBlitter(func_name)) {
     return;
   }
 
@@ -13240,6 +13252,55 @@ void GLES2DecoderImpl::DoCopyTexSubImage2D(
   ExitCommandProcessingEarly();
 }
 
+void GLES2DecoderImpl::DoCopyTexSubImage3D(
+    GLenum target,
+    GLint level,
+    GLint xoffset,
+    GLint yoffset,
+    GLint zoffset,
+    GLint x,
+    GLint y,
+    GLsizei width,
+    GLsizei height) {
+  const char* func_name = "glCopyTexSubImage3D";
+  DCHECK(!ShouldDeferReads());
+  TextureRef* texture_ref = texture_manager()->GetTextureInfoForTarget(
+      &state_, target);
+  if (!texture_ref) {
+    LOCAL_SET_GL_ERROR(
+        GL_INVALID_OPERATION, func_name, "unknown texture for target");
+    return;
+  }
+  Texture* texture = texture_ref->texture();
+  GLenum type = 0;
+  GLenum internal_format = 0;
+  if (!texture->GetLevelType(target, level, &type, &internal_format) ||
+      !texture->ValidForTexture(
+          target, level, xoffset, yoffset, zoffset, width, height, 1)) {
+    LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, func_name, "bad dimensions.");
+    return;
+  }
+
+  if (!CheckBoundReadFramebufferValid(func_name,
+                                      GL_INVALID_FRAMEBUFFER_OPERATION)) {
+    return;
+  }
+
+  GLenum read_format = GetBoundReadFrameBufferInternalFormat();
+  GLenum read_type = GetBoundReadFrameBufferTextureType();
+  if (!ValidateCopyTexFormat(func_name, internal_format,
+                             read_format, read_type)) {
+    return;
+  }
+
+  glCopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width,

[Zhenyao Mo, 2016/07/27 17:38:29]

Here you still miss a bunch of stuff. 1) feedback look detection 2) emulation of
unsized formats in core profile, 3) make sure we clear the 3D textures if it's
uncleared.

It's OK to do it in a followup CL, but at least add a TODO.

[yunchao, 2016/07/27 23:46:11]

Done.

+                       height);

[qiankun, 2016/07/27 13:56:26]

extra space before "height"

[yunchao, 2016/07/27 23:46:11]

Done.

+
+  // This may be a slow command.  Exit command processing to allow for
+  // context preemption and GPU watchdog checks.
+  ExitCommandProcessingEarly();
+}
+
 error::Error GLES2DecoderImpl::HandleTexSubImage2D(uint32_t immediate_data_size,
                                                    const void* cmd_data) {
   const gles2::cmds::TexSubImage2D& c =