Support cube map dest target for CopyTextureCHROMIUM extension

gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.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_copy_texture_chromium.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 533 matching lines @@
                       GLuint source_id,
                       GLint source_level,
                       GLenum dest_target,
                       GLuint dest_id,
                       GLint dest_level,
                       GLenum dest_internal_format,
                       GLsizei width,
                       GLsizei height,
                       GLuint framebuffer) {
   DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_2D), source_target);
-  DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_2D), dest_target);
+  GLenum dest_binding_target =
+      gpu::gles2::GLES2Util::GLFaceTargetToTextureTarget(dest_target);
+  DCHECK(dest_binding_target == GL_TEXTURE_2D ||
+         dest_binding_target == GL_TEXTURE_CUBE_MAP);
   DCHECK(source_level == 0 || decoder->GetFeatureInfo()->IsES3Capable());
   if (BindFramebufferTexture2D(source_target, source_id, source_level,
                                framebuffer)) {
-    glBindTexture(dest_target, dest_id);
-    glTexParameterf(dest_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameterf(dest_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(dest_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glTexParameteri(dest_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glBindTexture(dest_binding_target, dest_id);
+    glTexParameterf(dest_binding_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterf(dest_binding_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(dest_binding_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(dest_binding_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glCopyTexImage2D(dest_target, dest_level, dest_internal_format, 0 /* x */,
                      0 /* y */, width, height, 0 /* border */);
   }
 
   decoder->RestoreTextureState(source_id);
   decoder->RestoreTextureState(dest_id);
   decoder->RestoreTextureUnitBindings(0);
   decoder->RestoreActiveTexture();
   decoder->RestoreFramebufferBindings();
 }
 
 void DoCopyTexSubImage2D(const gpu::gles2::GLES2Decoder* decoder,
                          GLenum source_target,
                          GLuint source_id,
                          GLint source_level,
                          GLenum dest_target,
                          GLuint dest_id,
                          GLint dest_level,
                          GLint xoffset,
                          GLint yoffset,
                          GLint source_x,
                          GLint source_y,
                          GLsizei source_width,
                          GLsizei source_height,
                          GLuint framebuffer) {
   DCHECK(source_target == GL_TEXTURE_2D ||
          source_target == GL_TEXTURE_RECTANGLE_ARB);
-  DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_2D), dest_target);
+  GLenum dest_binding_target =
+      gpu::gles2::GLES2Util::GLFaceTargetToTextureTarget(dest_target);
+  DCHECK(dest_binding_target == GL_TEXTURE_2D ||
+         dest_binding_target == GL_TEXTURE_CUBE_MAP);
   DCHECK(source_level == 0 || decoder->GetFeatureInfo()->IsES3Capable());
   if (BindFramebufferTexture2D(source_target, source_id, source_level,
                                framebuffer)) {
-    glBindTexture(dest_target, dest_id);
-    glTexParameterf(dest_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameterf(dest_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    glTexParameteri(dest_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    glTexParameteri(dest_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glBindTexture(dest_binding_target, dest_id);
+    glTexParameterf(dest_binding_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameterf(dest_binding_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(dest_binding_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(dest_binding_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glCopyTexSubImage2D(dest_target, dest_level, xoffset, yoffset, source_x,
                         source_y, source_width, source_height);
   }
 
   decoder->RestoreTextureState(source_id);
   decoder->RestoreTextureState(dest_id);
   decoder->RestoreTextureUnitBindings(0);
   decoder->RestoreActiveTexture();
   decoder->RestoreFramebufferBindings();
 }
@@ skipping 97 matching lines @@
     GLuint dest_id,
     GLint dest_level,
     GLenum dest_internal_format,
     GLsizei width,
     GLsizei height,
     bool flip_y,
     bool premultiply_alpha,
     bool unpremultiply_alpha,
     CopyTextureMethod method) {
   bool premultiply_alpha_change = premultiply_alpha ^ unpremultiply_alpha;
+  GLenum dest_binding_target =
+      gpu::gles2::GLES2Util::GLFaceTargetToTextureTarget(dest_target);
 
   // GL_TEXTURE_RECTANGLE_ARB on FBO is supported by OpenGL, not GLES2,
-  // so restrict this to GL_TEXTURE_2D.
-  if (source_target == GL_TEXTURE_2D && dest_target == GL_TEXTURE_2D &&
+  // so restrict this to GL_TEXTURE_2D and GL_TEXTURE_CUBE_MAP.
+  if (source_target == GL_TEXTURE_2D &&
+      (dest_binding_target == GL_TEXTURE_2D ||
+       dest_binding_target == GL_TEXTURE_CUBE_MAP) &&
       !flip_y && !premultiply_alpha_change && method == DIRECT_COPY) {
     DoCopyTexImage2D(decoder, source_target, source_id, source_level,
                      dest_target, dest_id, dest_level, dest_internal_format,
                      width, height, framebuffer_);
     return;
   }
 
+  // Draw to level 0 of an intermediate GL_TEXTURE_2D texture.
   GLuint dest_texture = dest_id;
   GLuint intermediate_texture = 0;
   GLint original_dest_level = dest_level;
+  GLenum original_dest_target = dest_target;
+  GLenum original_internal_format = dest_internal_format;
   if (method == DRAW_AND_COPY) {
     GLenum adjusted_internal_format =
         getIntermediateFormat(dest_internal_format);
+    dest_target = GL_TEXTURE_2D;
     glGenTextures(1, &intermediate_texture);
     glBindTexture(dest_target, intermediate_texture);
     GLenum format = TextureManager::ExtractFormatFromStorageFormat(
         adjusted_internal_format);
     GLenum type =
         TextureManager::ExtractTypeFromStorageFormat(adjusted_internal_format);
 
     glTexImage2D(dest_target, 0, adjusted_internal_format, width, height, 0,
                  format, type, nullptr);
     dest_texture = intermediate_texture;
     dest_level = 0;
     dest_internal_format = adjusted_internal_format;
   }
   // Use kIdentityMatrix if no transform passed in.
   DoCopyTextureWithTransform(
       decoder, source_target, source_id, source_level, source_internal_format,
       dest_target, dest_texture, dest_level, dest_internal_format, width,
       height, flip_y, premultiply_alpha, unpremultiply_alpha, kIdentityMatrix);
 
   if (method == DRAW_AND_COPY) {
     source_level = 0;
-    dest_level = original_dest_level;
     DoCopyTexImage2D(decoder, dest_target, intermediate_texture, source_level,
-                     dest_target, dest_id, dest_level, dest_internal_format,
-                     width, height, framebuffer_);
+                     original_dest_target, dest_id, original_dest_level,
+                     original_internal_format, width, height, framebuffer_);
     glDeleteTextures(1, &intermediate_texture);
   }
 }
 
 void CopyTextureCHROMIUMResourceManager::DoCopySubTexture(
     const gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLint source_level,
     GLenum source_internal_format,
@@ skipping 17 matching lines @@
     CopyTextureMethod method) {
   bool use_gl_copy_tex_sub_image_2d = true;
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
   // glDrawArrays is faster than glCopyTexSubImage2D on IA Mesa driver,
   // although opposite in Android.
   // TODO(dshwang): After Mesa fixes this issue, remove this hack.
   // https://bugs.freedesktop.org/show_bug.cgi?id=98478 crbug.com/535198
   use_gl_copy_tex_sub_image_2d = false;
 #endif
   bool premultiply_alpha_change = premultiply_alpha ^ unpremultiply_alpha;
+  GLenum dest_binding_target =
+      gpu::gles2::GLES2Util::GLFaceTargetToTextureTarget(dest_target);
 
   // GL_TEXTURE_RECTANGLE_ARB on FBO is supported by OpenGL, not GLES2,
-  // so restrict this to GL_TEXTURE_2D.
+  // so restrict this to GL_TEXTURE_2D and GL_TEXTURE_CUBE_MAP.
   if (use_gl_copy_tex_sub_image_2d && source_target == GL_TEXTURE_2D &&
-      dest_target == GL_TEXTURE_2D && !flip_y && !premultiply_alpha_change &&
-      method == DIRECT_COPY) {
+      (dest_binding_target == GL_TEXTURE_2D ||
+       dest_binding_target == GL_TEXTURE_CUBE_MAP) &&
+      !flip_y && !premultiply_alpha_change && method == DIRECT_COPY) {
     DoCopyTexSubImage2D(decoder, source_target, source_id, source_level,
                         dest_target, dest_id, dest_level, xoffset, yoffset, x,
                         y, width, height, framebuffer_);
     return;
   }
 
+  // Draw to level 0 of an intermediate GL_TEXTURE_2D texture.
   GLint dest_xoffset = xoffset;
   GLint dest_yoffset = yoffset;
   GLuint dest_texture = dest_id;
   GLint original_dest_level = dest_level;
+  GLenum original_dest_target = dest_target;
   GLuint intermediate_texture = 0;
   if (method == DRAW_AND_COPY) {
     GLenum adjusted_internal_format =
         getIntermediateFormat(dest_internal_format);
+    dest_target = GL_TEXTURE_2D;
     glGenTextures(1, &intermediate_texture);
     glBindTexture(dest_target, intermediate_texture);
     GLenum format = TextureManager::ExtractFormatFromStorageFormat(
         adjusted_internal_format);
     GLenum type =
         TextureManager::ExtractTypeFromStorageFormat(adjusted_internal_format);
 
     glTexImage2D(dest_target, 0, adjusted_internal_format, width, height, 0,
                  format, type, nullptr);
     dest_texture = intermediate_texture;
     dest_level = 0;
     dest_internal_format = adjusted_internal_format;
     dest_xoffset = 0;
     dest_yoffset = 0;
     dest_width = width;
     dest_height = height;
   }
 
   DoCopySubTextureWithTransform(
       decoder, source_target, source_id, source_level, source_internal_format,
       dest_target, dest_texture, dest_level, dest_internal_format, dest_xoffset,
       dest_yoffset, x, y, width, height, dest_width, dest_height, source_width,
       source_height, flip_y, premultiply_alpha, unpremultiply_alpha,
       kIdentityMatrix);
 
   if (method == DRAW_AND_COPY) {
     source_level = 0;
-    dest_level = original_dest_level;
     DoCopyTexSubImage2D(decoder, dest_target, intermediate_texture,
-                        source_level, dest_target, dest_id, dest_level, xoffset,
-                        yoffset, 0, 0, width, height, framebuffer_);
+                        source_level, original_dest_target, dest_id,
+                        original_dest_level, xoffset, yoffset, 0, 0, width,
+                        height, framebuffer_);
     glDeleteTextures(1, &intermediate_texture);
   }
 }
 
 void CopyTextureCHROMIUMResourceManager::DoCopySubTextureWithTransform(
     const gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLint source_level,
     GLenum source_internal_format,
@@ skipping 280 matching lines @@
   decoder->RestoreTextureUnitBindings(0);
   decoder->RestoreActiveTexture();
   decoder->RestoreProgramBindings();
   decoder->RestoreBufferBindings();
   decoder->RestoreFramebufferBindings();
   decoder->RestoreGlobalState();
 }
 
 }  // namespace gles2
 }  // namespace gpu