Reland of Extend CopyTextureCHROMIUM to more ES 3.0 texture formats.

gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_COPY_TEXTURE_CHROMIUM_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_COPY_TEXTURE_CHROMIUM_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 
 class GLES2Decoder;
 
+enum SupportedCopyMethodByFormat {

[Ken Russell (switch to Gerrit), 2016/12/07 06:38:01]

Could we choose another name for this enum? Perhaps CopyTextureMethod?

[qiankun, 2016/12/10 00:12:40]

Done.

+  DIRECT_COPY,

[Ken Russell (switch to Gerrit), 2016/12/07 06:38:02]

Could you please add a one-line comment documenting each of these? Mentioning
that this uses CopyTex{Sub}Image2D to copy from the source to the destination,
for example?

[qiankun, 2016/12/10 00:12:40]

Done.

+  DIRECT_DRAW,

[Ken Russell (switch to Gerrit), 2016/12/07 06:38:02]

Could you mention that this draws from the source to the destination texture?

[qiankun, 2016/12/10 00:12:40]

Done.

+  DRAW_AND_COPY,

[Ken Russell (switch to Gerrit), 2016/12/07 06:38:01]

Could you mention that this draws to an intermediate texture, and the copies to
the destination texture?

[qiankun, 2016/12/10 00:12:40]

Done.

+  NONE_COPY

[Ken Russell (switch to Gerrit), 2016/12/07 06:38:02]

Perhaps NOT_COPYABLE?

[qiankun, 2016/12/10 00:12:40]

Done.

+};
+
 // This class encapsulates the resources required to implement the
 // GL_CHROMIUM_copy_texture extension.  The copy operation is performed
 // via glCopyTexImage2D() or a blit to a framebuffer object.
 // The target of |dest_id| texture must be GL_TEXTURE_2D.
 class GPU_EXPORT CopyTextureCHROMIUMResourceManager {
  public:
   CopyTextureCHROMIUMResourceManager();
   ~CopyTextureCHROMIUMResourceManager();
 
   void Initialize(const gles2::GLES2Decoder* decoder,
                   const gles2::FeatureInfo::FeatureFlags& feature_flags);
   void Destroy();
 
   void DoCopyTexture(const gles2::GLES2Decoder* decoder,
                      GLenum source_target,
                      GLuint source_id,
                      GLenum source_internal_format,
                      GLenum dest_target,
                      GLuint dest_id,
                      GLenum dest_internal_format,
                      GLsizei width,
                      GLsizei height,
                      bool flip_y,
                      bool premultiply_alpha,
-                     bool unpremultiply_alpha);
+                     bool unpremultiply_alpha,
+                     SupportedCopyMethodByFormat method);
 
   void 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,
                         GLint x,
                         GLint y,
                         GLsizei width,
                         GLsizei height,
                         GLsizei dest_width,
                         GLsizei dest_height,
                         GLsizei source_width,
                         GLsizei source_height,
                         bool flip_y,
                         bool premultiply_alpha,
-                        bool unpremultiply_alpha);
+                        bool unpremultiply_alpha,
+                        SupportedCopyMethodByFormat method);
 
   void 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 10 matching lines @@
                                      bool unpremultiply_alpha,
                                      const GLfloat transform_matrix[16]);
 
   // This will apply a transform on the texture coordinates before sampling
   // the source texture and copying to the destination texture. The transform
   // matrix should be given in column-major form, so it can be passed
   // directly to GL.
   void DoCopyTextureWithTransform(const gles2::GLES2Decoder* decoder,
                                   GLenum source_target,
                                   GLuint source_id,
+                                  GLenum source_format,
                                   GLenum dest_target,
                                   GLuint dest_id,
+                                  GLenum dest_format,
                                   GLsizei width,
                                   GLsizei height,
                                   bool flip_y,
                                   bool premultiply_alpha,
                                   bool unpremultiply_alpha,
                                   const GLfloat transform_matrix[16]);
 
   // The attributes used during invocation of the extension.
   static const GLuint kVertexPositionAttrib = 0;
 
@@ skipping 20 matching lines @@
     GLuint vertex_source_mult_handle;
     GLuint vertex_source_add_handle;
 
     GLuint tex_coord_transform_handle;
     GLuint sampler_handle;
   };
 
   void DoCopyTextureInternal(const gles2::GLES2Decoder* decoder,
                              GLenum source_target,
                              GLuint source_id,
+                             GLenum source_format,
                              GLenum dest_target,
                              GLuint dest_id,
+                             GLenum dest_format,
                              GLint xoffset,
                              GLint yoffset,
                              GLint x,
                              GLint y,
                              GLsizei width,
                              GLsizei height,
                              GLsizei dest_width,
                              GLsizei dest_height,
                              GLsizei source_width,
                              GLsizei source_height,
@@ skipping 14 matching lines @@
   GLuint buffer_id_;
   GLuint framebuffer_;
 
   DISALLOW_COPY_AND_ASSIGN(CopyTextureCHROMIUMResourceManager);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_COPY_TEXTURE_CHROMIUM_H_