Fix CopyTextureCHROMIUM on core profile.

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 11520 matching lines @@
   }
 
   // Assumes the size has already been checked.
   std::unique_ptr<char[]> zero(new char[size]);
   memset(zero.get(), 0, size);
   glBindTexture(texture->target(), texture->service_id());
 
   GLint y = 0;
   while (y < height) {
     GLint h = y + tile_height > height ? height - y : tile_height;
-    glTexSubImage2D(target, level, xoffset, yoffset + y, width, h, format, type,
-                    zero.get());
+    glTexSubImage2D(
+        target, level, xoffset, yoffset + y, width, h,
+        TextureManager::AdjustTexFormat(feature_info_.get(), format),
+        type,
+        zero.get());
     y += tile_height;
   }
   TextureRef* bound_texture =
       texture_manager()->GetTextureInfoForTarget(&state_, texture->target());
   glBindTexture(texture->target(),
                 bound_texture ? bound_texture->service_id() : 0);
   return true;
 }
 
 bool GLES2DecoderImpl::ClearCompressedTextureLevel(Texture* texture,
@@ skipping 3457 matching lines @@
   bool valid_source_format =
       source_internal_format == GL_RED || source_internal_format == GL_ALPHA ||
       source_internal_format == GL_RGB || source_internal_format == GL_RGBA ||
       source_internal_format == GL_RGB8 || source_internal_format == GL_RGBA8 ||
       source_internal_format == GL_LUMINANCE ||
       source_internal_format == GL_LUMINANCE_ALPHA ||
       source_internal_format == GL_BGRA_EXT ||
       source_internal_format == GL_BGRA8_EXT ||
       source_internal_format == GL_RGB_YCBCR_420V_CHROMIUM ||
       source_internal_format == GL_RGB_YCBCR_422_CHROMIUM;
-  if (!valid_source_format || !valid_dest_format) {
+  if (!valid_source_format) {
+    std::string msg = "invalid source internal format " +
+        GLES2Util::GetStringEnum(source_internal_format);
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
-                       "invalid internal format");
+                       msg.c_str());
+    return false;
+  }
+  if (!valid_dest_format) {
+    std::string msg = "invalid dest internal format " +
+        GLES2Util::GetStringEnum(dest_internal_format);
+    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
+                       msg.c_str());
     return false;
   }
   return true;
 }
 
 bool GLES2DecoderImpl::ValidateCompressedCopyTextureCHROMIUM(
     const char* function_name,
     TextureRef* source_texture_ref,
     TextureRef* dest_texture_ref) {
   if (!source_texture_ref || !dest_texture_ref) {
@@ skipping 2692 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