gpu, cmaa: reuse CopyTextureCHROMIUMResourceManager

gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc

Index: gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
index 8b53d0f4c402449b60fab2c23a0e1b514bb7307d..a3ada9c1d77c399a1bd9cc69007a2b8424e1a94f 100644
--- a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
+++ b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
@@ -319,6 +319,36 @@ void DoCopyTexSubImage2D(const gpu::gles2::GLES2Decoder* decoder,
   decoder->RestoreFramebufferBindings();
 }
 
+GLenum UnsizedFormatFrom(GLenum internal_format) {
+  switch (internal_format) {
+    case GL_RGB:
+    case GL_RGB8:
+      return GL_RGB;
+    case GL_RGBA:
+    case GL_RGBA8:
+      return GL_RGBA;
+    case GL_BGRA_EXT:
+    case GL_BGRA8_EXT:
+      return GL_BGRA_EXT;
+    default:
+      NOTREACHED();

[piman, 2016/11/01 19:04:59]

I think this needs to be expanded to more formats. See test failures.

You can take a look at the logic we have in GLES2DecoderImpl::DoCopyTexImage2D
to check the API behavior.

Maybe here you can use TextureManager::ExtractFormatFromStorageFormat ?

[dshwang, 2016/11/01 19:30:05]

exactly, this DCHECK causes crash. Done.
It's used by only below SourceFormatContainSupersetOfDestFormat, so I add
sufficient format to satisfy the below function.
The function consider GL_COMPRESSED_RGBA_S3TC_DXT1_EXT as RGBA, which is
impossible to use glCopyTexSubImage2D.

I want to express
(UnsizedFormatFrom(source_internal_format) ==
UnsizedFormatFrom(dest_internal_format) && (source_internal_format !=
GL_BGRA_EXT && source_internal_format != GL_BGRA8_EXT) ||
(source_internal_format == GL_RGBA && dest_internal_format) == GL_RGB) ||
(source_internal_format == GL_RGBA8 && dest_internal_format) == GL_RGB) ||
(source_internal_format == GL_RGBA && dest_internal_format) == GL_RGB8) ||
(source_internal_format == GL_RGBA8 && dest_internal_format) == GL_RGB8);

However, it's too long so just make this helper function.

[dshwang, 2016/11/01 19:35:17]

I gave up this non-trivial change which cause lots of webgl conformance test
failures on Mac. It's not needed in this CL. So remove it.

I cannot understand why mac fail. I'll figure out and submit another CL about
it.

+      return GL_RGBA;
+  }
+}
+
+// GL_INVALID_OPERATION is generated if the currently bound framebuffer's
+// format does not contain a superset of the components required by the base
+// format of internalformat.
+// https://www.khronos.org/opengles/sdk/docs/man/xhtml/glCopyTexImage2D.xml
+bool SourceFormatContainSupersetOfDestFormat(GLenum source_internal_format,
+                                             GLenum dest_internal_format) {
+  return (UnsizedFormatFrom(source_internal_format) ==
+              UnsizedFormatFrom(dest_internal_format) &&
+          UnsizedFormatFrom(source_internal_format) != GL_BGRA_EXT) ||
+         (UnsizedFormatFrom(source_internal_format) == GL_RGBA &&
+          UnsizedFormatFrom(dest_internal_format) == GL_RGB);
+}
+
 }  // namespace
 
 namespace gpu {
@@ -421,14 +451,9 @@ void CopyTextureCHROMIUMResourceManager::DoCopyTexture(
     bool premultiply_alpha,
     bool unpremultiply_alpha) {
   bool premultiply_alpha_change = premultiply_alpha ^ unpremultiply_alpha;
-  // GL_INVALID_OPERATION is generated if the currently bound framebuffer's
-  // format does not contain a superset of the components required by the base
-  // format of internalformat.
-  // 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);
+      SourceFormatContainSupersetOfDestFormat(source_internal_format,
+                                              dest_internal_format);
   // 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 &&
@@ -473,19 +498,22 @@ void CopyTextureCHROMIUMResourceManager::DoCopySubTexture(
     bool flip_y,
     bool premultiply_alpha,
     bool unpremultiply_alpha) {
+  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;
-  // GL_INVALID_OPERATION is generated if the currently bound framebuffer's
-  // format does not contain a superset of the components required by the base
-  // format of internalformat.
-  // 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);
+      SourceFormatContainSupersetOfDestFormat(source_internal_format,
+                                              dest_internal_format);
   // 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 &&
+  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_);