Reland of Extend CopyTextureCHROMIUM to more ES 3.0 texture formats.

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 241 matching lines @@
 #ifndef NDEBUG
   GLenum fb_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
   if (GL_FRAMEBUFFER_COMPLETE != fb_status) {
     DLOG(ERROR) << "CopyTextureCHROMIUM: Incomplete framebuffer.";
     return false;
   }
 #endif
   return true;
 }
 
-void DoCopyTexImage2D(const gpu::gles2::GLES2Decoder* decoder,
-                      GLenum source_target,
-                      GLuint source_id,
-                      GLenum dest_target,
-                      GLuint dest_id,
-                      GLenum dest_internal_format,
-                      GLsizei width,
-                      GLsizei height,
-                      GLuint framebuffer) {
+void DoCopyTexImage2DInternal(const gpu::gles2::GLES2Decoder* decoder,
+                              GLenum source_target,
+                              GLuint source_id,
+                              GLenum dest_target,
+                              GLuint dest_id,
+                              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);
   if (BindFramebufferTexture2D(source_target, source_id, 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);
     glCopyTexImage2D(dest_target, 0 /* 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,
-                         GLenum dest_target,
-                         GLuint dest_id,
-                         GLint xoffset,
-                         GLint yoffset,
-                         GLint source_x,
-                         GLint source_y,
-                         GLsizei source_width,
-                         GLsizei source_height,
-                         GLuint framebuffer) {
+void DoCopyTexSubImage2DInternal(const gpu::gles2::GLES2Decoder* decoder,
+                                 GLenum source_target,
+                                 GLuint source_id,
+                                 GLenum dest_target,
+                                 GLuint dest_id,
+                                 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);
   if (BindFramebufferTexture2D(source_target, source_id, 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);
     glCopyTexSubImage2D(dest_target, 0 /* level */, xoffset, yoffset,
@@ skipping 115 matching lines @@
   // https://www.khronos.org/opengles/sdk/docs/man/xhtml/glCopyTexImage2D.xml
   bool source_format_contain_superset_of_dest_format =
       (source_internal_format == dest_internal_format &&
        source_internal_format != GL_BGRA_EXT) ||
       (source_internal_format == GL_RGBA && dest_internal_format == GL_RGB);
   // 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 &&
       !flip_y && !premultiply_alpha_change &&
       source_format_contain_superset_of_dest_format) {
-    DoCopyTexImage2D(decoder,
-                     source_target,
-                     source_id,
-                     dest_target,
-                     dest_id,
-                     dest_internal_format,
-                     width,
-                     height,
-                     framebuffer_);
+    DoCopyTexImage2DInternal(decoder,
+                             source_target,
+                             source_id,
+                             dest_target,
+                             dest_id,
+                             dest_internal_format,
+                             width,
+                             height,
+                             framebuffer_);
     return;
   }
 
   // Use kIdentityMatrix if no transform passed in.
   DoCopyTextureWithTransform(decoder, source_target, source_id, dest_target,
                              dest_id, width, height, flip_y, premultiply_alpha,
                              unpremultiply_alpha, kIdentityMatrix);
 }
 
+void CopyTextureCHROMIUMResourceManager::DoCopyTexImage2D(
+    const gpu::gles2::GLES2Decoder* decoder,
+    GLenum source_target,
+    GLuint source_id,
+    GLenum dest_target,
+    GLuint dest_id,
+    GLenum dest_internal_format,
+    GLsizei width,
+    GLsizei height) {
+  DoCopyTexImage2DInternal(decoder,
+      source_target,
+      source_id,
+      dest_target,
+      dest_id,
+      dest_internal_format,
+      width,
+      height,
+      framebuffer_);
+    return;
+}
+
 void CopyTextureCHROMIUMResourceManager::DoCopySubTexture(
     const gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLenum source_internal_format,
     GLenum dest_target,
     GLuint dest_id,
     GLenum dest_internal_format,
     GLint xoffset,
     GLint yoffset,
@@ skipping 23 matching lines @@
   // https://www.khronos.org/opengles/sdk/docs/man/xhtml/glCopyTexImage2D.xml
   bool source_format_contain_superset_of_dest_format =
       (source_internal_format == dest_internal_format &&
        source_internal_format != GL_BGRA_EXT) ||
       (source_internal_format == GL_RGBA && dest_internal_format == GL_RGB);
   // GL_TEXTURE_RECTANGLE_ARB on FBO is supported by OpenGL, not GLES2,
   // so restrict this to GL_TEXTURE_2D.
   if (use_gl_copy_tex_sub_image_2d && source_target == GL_TEXTURE_2D &&
       dest_target == GL_TEXTURE_2D && !flip_y && !premultiply_alpha_change &&
       source_format_contain_superset_of_dest_format) {
-    DoCopyTexSubImage2D(decoder, source_target, source_id, dest_target, dest_id,
-                        xoffset, yoffset, x, y, width, height, framebuffer_);
+    DoCopyTexSubImage2DInternal(decoder, source_target, source_id, dest_target,
+                                dest_id, xoffset, yoffset, x, y, width, height,
+                                framebuffer_);
     return;
   }
 
   DoCopySubTextureWithTransform(
       decoder, source_target, source_id, source_internal_format, dest_target,
       dest_id, dest_internal_format, xoffset, yoffset, x, y, width, height,
       dest_width, dest_height, source_width, source_height, flip_y,
       premultiply_alpha, unpremultiply_alpha, kIdentityMatrix);
 }
 
+void CopyTextureCHROMIUMResourceManager::DoCopyTexSubImage2D(
+    const gpu::gles2::GLES2Decoder* decoder,
+    GLenum source_target,
+    GLuint source_id,
+    GLenum dest_target,
+    GLuint dest_id,
+    GLint xoffset,
+    GLint yoffset,
+    GLint x,
+    GLint y,
+    GLsizei width,
+    GLsizei height) {
+  DoCopyTexSubImage2DInternal(decoder, source_target, source_id, dest_target,
+                              dest_id, xoffset, yoffset, x, y, width, height,
+                              framebuffer_);
+}
+
 void CopyTextureCHROMIUMResourceManager::DoCopySubTextureWithTransform(
     const gles2::GLES2Decoder* decoder,
     GLenum source_target,
     GLuint source_id,
     GLenum source_internal_format,
     GLenum dest_target,
     GLuint dest_id,
     GLenum dest_internal_format,
     GLint xoffset,
     GLint yoffset,
@@ skipping 251 matching lines @@
   decoder->RestoreTextureUnitBindings(0);
   decoder->RestoreActiveTexture();
   decoder->RestoreProgramBindings();
   decoder->RestoreBufferBindings();
   decoder->RestoreFramebufferBindings();
   decoder->RestoreGlobalState();
 }
 
 }  // namespace gles2
 }  // namespace gpu