Do not use IOSurface copyTexImage2D workaround for LUMA formats.

gpu/command_buffer/service/gles2_cmd_decoder.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_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 12419 matching lines @@
     GLenum final_internal_format = TextureManager::AdjustTexInternalFormat(
         feature_info_.get(), internal_format);
 
     // The service id and target of the texture attached to READ_FRAMEBUFFER.
     GLuint source_texture_service_id = 0;
     GLenum source_texture_target = 0;
     uint32_t channels_exist = GLES2Util::GetChannelsForFormat(read_format);
     bool use_workaround = NeedsCopyTextureImageWorkaround(
         final_internal_format, channels_exist, &source_texture_service_id,
         &source_texture_target);
-    if (use_workaround) {
-      DCHECK(!requires_luma_blit);
+    if (requires_luma_blit) {
+      copy_tex_image_blit_->DoCopyTexImage2DToLUMAComatabilityTexture(
+          this, texture->service_id(), texture->target(), target, format,
+          type, level, internal_format, copyX, copyY, copyWidth, copyHeight,
+          framebuffer_state_.bound_read_framebuffer->service_id(),
+          framebuffer_state_.bound_read_framebuffer
+              ->GetReadBufferInternalFormat());
+    } else if(use_workaround) {

[Zhenyao Mo, 2016/06/14 22:49:14]

nit: a space after if.

[erikchen, 2016/06/14 22:53:19]

Done.

       GLenum dest_texture_target = target;
       GLenum framebuffer_target = features().chromium_framebuffer_multisample
                                       ? GL_READ_FRAMEBUFFER_EXT
                                       : GL_FRAMEBUFFER;
 
       GLenum temp_internal_format = 0;
       if (channels_exist == GLES2Util::kRGBA) {
         temp_internal_format = GL_RGBA;
       } else if (channels_exist == GLES2Util::kRGB) {
         temp_internal_format = GL_RGB;
@@ skipping 20 matching lines @@
       glCopyTexImage2D(dest_texture_target, level, final_internal_format, 0, 0,
                        copyWidth, copyHeight, 0);
 
       // Rebind source texture.
       glFramebufferTexture2DEXT(framebuffer_target, GL_COLOR_ATTACHMENT0,
                                 source_texture_target,
                                 source_texture_service_id, 0);
 
       glDeleteTextures(1, &temp_texture);
     } else {
-      if (requires_luma_blit) {
-        copy_tex_image_blit_->DoCopyTexImage2DToLUMAComatabilityTexture(
-            this, texture->service_id(), texture->target(), target, format,
-            type, level, internal_format, copyX, copyY, copyWidth, copyHeight,
-            framebuffer_state_.bound_read_framebuffer->service_id(),
-            framebuffer_state_.bound_read_framebuffer
-                ->GetReadBufferInternalFormat());
-      } else {
-        glCopyTexImage2D(target, level, final_internal_format, copyX, copyY,
-                         copyWidth, copyHeight, border);
-      }
+      glCopyTexImage2D(target, level, final_internal_format, copyX, copyY,
+                       copyWidth, copyHeight, border);
     }
   }
   GLenum error = LOCAL_PEEK_GL_ERROR(func_name);
   if (error == GL_NO_ERROR) {
     texture_manager()->SetLevelInfo(texture_ref, target, level, internal_format,
                                     width, height, 1, border, format,
                                     type, gfx::Rect(width, height));
     texture->ApplyFormatWorkarounds(feature_info_.get());
   }
 
@@ skipping 4442 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu