Decompress ETC texture data when there is no native support.

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 46 matching lines @@
 #include "gpu/command_buffer/service/program_manager.h"
 #include "gpu/command_buffer/service/query_manager.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/sampler_manager.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/command_buffer/service/transform_feedback_manager.h"
 #include "gpu/command_buffer/service/vertex_array_manager.h"
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
+#include "third_party/angle/src/image_util/loadimage.h"
 #include "third_party/smhasher/src/City.h"
 #include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/ca_renderer_layer_params.h"
@@ skipping 852 matching lines @@
       GLint level,
       GLenum internal_format,
       GLsizei width,
       GLsizei height,
       GLsizei depth,
       GLint border,
       GLsizei image_size,
       const void* data);
 
   // Wrapper for CompressedTexSubImage2D.
-  void DoCompressedTexSubImage2D(
-      GLenum target,
-      GLint level,
-      GLint xoffset,
-      GLint yoffset,
-      GLsizei width,
-      GLsizei height,
-      GLenum format,
-      GLsizei imageSize,
-      const void* data);
+  error::Error DoCompressedTexSubImage2D(GLenum target,
+                                         GLint level,
+                                         GLint xoffset,
+                                         GLint yoffset,
+                                         GLsizei width,
+                                         GLsizei height,
+                                         GLenum format,
+                                         GLsizei imageSize,
+                                         const void* data);
 
   // Wrapper for CompressedTexSubImage3D.
-  void DoCompressedTexSubImage3D(
-      GLenum target,
-      GLint level,
-      GLint xoffset,
-      GLint yoffset,
-      GLint zoffset,
-      GLsizei width,
-      GLsizei height,
-      GLsizei depth,
-      GLenum format,
-      GLsizei image_size,
-      const void* data);
+  error::Error DoCompressedTexSubImage3D(GLenum target,
+                                         GLint level,
+                                         GLint xoffset,
+                                         GLint yoffset,
+                                         GLint zoffset,
+                                         GLsizei width,
+                                         GLsizei height,
+                                         GLsizei depth,
+                                         GLenum format,
+                                         GLsizei image_size,
+                                         const void* data);
 
   // Validate if |format| is valid for CopyTex{Sub}Image functions.
   // If not, generate a GL error and return false.
   bool ValidateCopyTexFormat(const char* func_name, GLenum internal_format,
                              GLenum read_format, GLenum read_type);
 
   // Wrapper for CopyTexImage2D.
   void DoCopyTexImage2D(
       GLenum target,
       GLint level,
@@ skipping 920 matching lines @@
   void MarkContextLost(error::ContextLostReason reason) override;
   bool CheckResetStatus();
 
   bool GetCompressedTexSizeInBytes(
       const char* function_name, GLsizei width, GLsizei height, GLsizei depth,
       GLenum format, GLsizei* size_in_bytes);
 
   bool ValidateCompressedTexDimensions(
       const char* function_name, GLenum target, GLint level,
       GLsizei width, GLsizei height, GLsizei depth, GLenum format);
-  bool ValidateCompressedTexFuncData(
-      const char* function_name, GLsizei width, GLsizei height, GLsizei depth,
-      GLenum format, GLsizei size);
+  bool ValidateCompressedTexFuncData(const char* function_name,
+                                     GLsizei width,
+                                     GLsizei height,
+                                     GLsizei depth,
+                                     GLenum format,
+                                     GLsizei size,
+                                     const GLvoid* data);
   bool ValidateCompressedTexSubDimensions(
     const char* function_name,
     GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
     GLsizei width, GLsizei height, GLsizei depth, GLenum format,
     Texture* texture);
   bool ValidateCopyTextureCHROMIUMTextures(const char* function_name,
                                            TextureRef* source_texture_ref,
                                            TextureRef* dest_texture_ref);
   bool ValidateCopyTextureCHROMIUMInternalFormats(
       const char* function_name,
@@ skipping 9559 matching lines @@
     {8, 5},
     {8, 6},
     {8, 8},
     {10, 5},
     {10, 6},
     {10, 8},
     {10, 10},
     {12, 10},
     {12, 12}};
 
+bool CheckETCFormatSupport(const FeatureInfo& featureInfo) {
+  const gl::GLVersionInfo& versionInfo = featureInfo.gl_version_info();
+  return versionInfo.IsAtLeastGL(4, 3) || versionInfo.IsAtLeastGLES(3, 0) ||
+         featureInfo.feature_flags().arb_es3_compatibility;
+}
+
+using CompressedFormatSupportCheck = bool (*)(const FeatureInfo&);
+using CompressedFormatDecompressionFunction = void (*)(size_t width,
+                                                       size_t height,
+                                                       size_t depth,
+                                                       const uint8_t* input,
+                                                       size_t inputRowPitch,
+                                                       size_t inputDepthPitch,
+                                                       uint8_t* output,
+                                                       size_t outputRowPitch,
+                                                       size_t outputDepthPitch);
+
+struct CompressedFormatInfo {
+  GLenum format;
+  uint32_t block_size;
+  uint32_t bytes_per_block;
+  CompressedFormatSupportCheck support_check;
+  CompressedFormatDecompressionFunction decompression_function;
+  GLenum decompressed_internal_format;
+  GLenum decompressed_format;
+  GLenum decompressed_type;
+};
+
+const CompressedFormatInfo kCompressedFormatInfoArray[] = {
+    {
+        GL_COMPRESSED_R11_EAC, 4, 8, CheckETCFormatSupport,
+        angle::LoadEACR11ToR8, GL_R8, GL_RED, GL_UNSIGNED_BYTE,
+    },
+    {
+        GL_COMPRESSED_SIGNED_R11_EAC, 4, 8, CheckETCFormatSupport,
+        angle::LoadEACR11SToR8, GL_R8_SNORM, GL_RED, GL_BYTE,
+    },
+    {
+        GL_COMPRESSED_RG11_EAC, 4, 16, CheckETCFormatSupport,
+        angle::LoadEACRG11ToRG8, GL_RG8, GL_RG, GL_UNSIGNED_BYTE,
+    },
+    {
+        GL_COMPRESSED_SIGNED_RG11_EAC, 4, 16, CheckETCFormatSupport,
+        angle::LoadEACRG11SToRG8, GL_RG8_SNORM, GL_RG, GL_BYTE,
+    },
+    {
+        GL_COMPRESSED_RGB8_ETC2, 4, 8, CheckETCFormatSupport,
+        angle::LoadETC2RGB8ToRGBA8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE,
+    },
+    {
+        GL_COMPRESSED_SRGB8_ETC2, 4, 8, CheckETCFormatSupport,
+        angle::LoadETC2SRGB8ToRGBA8, GL_SRGB8_ALPHA8, GL_SRGB_ALPHA,
+        GL_UNSIGNED_BYTE,
+    },
+    {
+        GL_COMPRESSED_RGBA8_ETC2_EAC, 4, 16, CheckETCFormatSupport,
+        angle::LoadETC2RGBA8ToRGBA8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE,
+    },
+    {
+        GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2, 4, 8,
+        CheckETCFormatSupport, angle::LoadETC2RGB8A1ToRGBA8, GL_RGBA8, GL_RGBA,
+        GL_UNSIGNED_BYTE,
+    },
+    {
+        GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC, 4, 16, CheckETCFormatSupport,
+        angle::LoadETC2SRGBA8ToSRGBA8, GL_SRGB8_ALPHA8, GL_SRGB_ALPHA,
+        GL_UNSIGNED_BYTE,
+    },
+    {
+        GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2, 4, 8,
+        CheckETCFormatSupport, angle::LoadETC2SRGB8A1ToRGBA8, GL_SRGB8_ALPHA8,
+        GL_SRGB_ALPHA, GL_UNSIGNED_BYTE,
+    },
+};
+
+const CompressedFormatInfo* GetCompressedFormatInfo(GLenum format) {
+  for (size_t i = 0; i < arraysize(kCompressedFormatInfoArray); i++) {
+    if (kCompressedFormatInfoArray[i].format == format) {
+      return &kCompressedFormatInfoArray[i];
+    }
+  }
+  return nullptr;
+}
+
+uint32_t GetCompressedFormatRowPitch(const CompressedFormatInfo& info,
+                                     uint32_t width) {
+  uint32_t num_blocks_wide = (width + info.block_size - 1) / info.block_size;
+  return num_blocks_wide * info.bytes_per_block;
+}
+
+uint32_t GetCompressedFormatDepthPitch(const CompressedFormatInfo& info,
+                                       uint32_t width,
+                                       uint32_t height) {
+  uint32_t num_blocks_high = (height + info.block_size - 1) / info.block_size;
+  return num_blocks_high * GetCompressedFormatRowPitch(info, width);
+}
+
+std::unique_ptr<uint8_t[]> DecompressTextureData(
+    const ContextState& state,
+    const CompressedFormatInfo& info,
+    uint32_t width,
+    uint32_t height,
+    uint32_t depth,
+    GLsizei image_size,
+    const void* data) {
+  uint32_t output_pixel_size = GLES2Util::ComputeImageGroupSize(
+      info.decompressed_format, info.decompressed_type);
+  std::unique_ptr<uint8_t[]> decompressed_data(
+      new uint8_t[output_pixel_size * width * height]);
+
+  // If a PBO is bound, map it to decompress the data.
+  const void* input_data = data;
+  if (state.bound_pixel_unpack_buffer) {
+    input_data = glMapBufferRange(GL_PIXEL_UNPACK_BUFFER,
+                                  reinterpret_cast<GLintptr>(data), image_size,
+                                  GL_MAP_READ_BIT);
+  }
+
+  info.decompression_function(
+      width, height, depth, static_cast<const uint8_t*>(input_data),
+      GetCompressedFormatRowPitch(info, width),
+      GetCompressedFormatDepthPitch(info, width, height),
+      decompressed_data.get(), output_pixel_size * width,
+      output_pixel_size * width * height);
+
+  if (state.bound_pixel_unpack_buffer) {
+    if (glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER) != GL_TRUE) {
+      LOG(ERROR) << "glUnmapBuffer unexpectedly returned GL_FALSE";
+      return nullptr;
+    }
+  }
+
+  return decompressed_data;
+}
+
 bool IsValidDXTSize(GLint level, GLsizei size) {
   // TODO(zmo): Linux NVIDIA driver does allow size of 1 and 2 on level 0.
   // However, the WebGL conformance test and blink side code forbid it.
   // For now, let's be on the cautious side. If all drivers behaves the same
   // as Linux NVIDIA, then we can remove this limitation.
   return (level && size == 1) ||
          (level && size == 2) ||
          !(size % kS3TCBlockWidth);
 }
 
@@ skipping 121 matching lines @@
 
   if (!bytes_required.IsValid()) {
     LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, function_name, "invalid size");
     return false;
   }
 
   *size_in_bytes = bytes_required.ValueOrDefault(0);
   return true;
 }
 
-bool GLES2DecoderImpl::ValidateCompressedTexFuncData(
-    const char* function_name, GLsizei width, GLsizei height, GLsizei depth,
-    GLenum format, GLsizei size) {
+bool GLES2DecoderImpl::ValidateCompressedTexFuncData(const char* function_name,
+                                                     GLsizei width,
+                                                     GLsizei height,
+                                                     GLsizei depth,
+                                                     GLenum format,
+                                                     GLsizei size,
+                                                     const GLvoid* data) {
   GLsizei bytes_required = 0;
   if (!GetCompressedTexSizeInBytes(
           function_name, width, height, depth, format, &bytes_required)) {
     return false;
   }
 
   if (size != bytes_required) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, function_name, "size is not correct for dimensions");
     return false;
   }
 
+  if (state_.bound_pixel_unpack_buffer.get()) {
+    if (state_.bound_pixel_unpack_buffer->GetMappedRange() != nullptr) {
+      LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
+                         "pixel unpack buffer is mapped");
+      return false;
+    }
+
+    base::CheckedNumeric<GLintptr> pbo_bytes_required(
+        reinterpret_cast<GLintptr>(data));
+    pbo_bytes_required += bytes_required;
+    if (!pbo_bytes_required.IsValid() ||
+        pbo_bytes_required.ValueOrDie() >
+            state_.bound_pixel_unpack_buffer->size()) {
+      LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
+                         "pixel unpack buffer is not large enough");
+      return false;
+    }
+  }
+
   return true;
 }
 
 bool GLES2DecoderImpl::ValidateCompressedTexDimensions(
     const char* function_name, GLenum target, GLint level,
     GLsizei width, GLsizei height, GLsizei depth, GLenum format) {
   switch (format) {
     case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
     case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
     case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
@@ skipping 231 matching lines @@
   }
   Texture* texture = texture_ref->texture();
   if (texture->IsImmutable()) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glCompressedTexImage2D", "texture is immutable");
     return error::kNoError;
   }
   if (!ValidateCompressedTexDimensions("glCompressedTexImage2D", target, level,
                                        width, height, 1, internal_format) ||
-      !ValidateCompressedTexFuncData("glCompressedTexImage2D", width, height,
-                                     1, internal_format, image_size)) {
+      !ValidateCompressedTexFuncData("glCompressedTexImage2D", width, height, 1,
+                                     internal_format, image_size, data)) {
     return error::kNoError;
   }
 
   if (!EnsureGPUMemoryAvailable(image_size)) {
     LOCAL_SET_GL_ERROR(
         GL_OUT_OF_MEMORY, "glCompressedTexImage2D", "out of memory");
     return error::kNoError;
   }
 
   if (texture->IsAttachedToFramebuffer()) {
     framebuffer_state_.clear_state_dirty = true;
   }
 
   std::unique_ptr<int8_t[]> zero;
-  if (!data) {
+  if (!state_.bound_pixel_unpack_buffer && !data) {
     zero.reset(new int8_t[image_size]);
     memset(zero.get(), 0, image_size);
     data = zero.get();
   }
   LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER("glCompressedTexImage2D");
-  glCompressedTexImage2D(
-      target, level, internal_format, width, height, border, image_size, data);
+
+  const CompressedFormatInfo* format_info =
+      GetCompressedFormatInfo(internal_format);
+  if (format_info != nullptr && !format_info->support_check(*feature_info_)) {
+    std::unique_ptr<uint8_t[]> decompressed_data = DecompressTextureData(
+        state_, *format_info, width, height, 1, image_size, data);
+    if (!decompressed_data) {
+      MarkContextLost(error::kGuilty);
+      group_->LoseContexts(error::kInnocent);
+      return error::kLostContext;

[piman, 2016/07/11 19:38:45]

You don't really need to return kLostContext here, and the associated autogen
complexity, because MarcContextLost sets current_decoder_error_, which will exit
the processing loop and raise the error (albeit possibly delayed for a few
commands, which is ok).

[Geoff Lang, 2016/07/11 20:08:36]

Done.

+    }
+    state_.PushTextureDecompressionUnpackState();
+    glTexImage2D(target, level, format_info->decompressed_internal_format,
+                 width, height, border, format_info->decompressed_format,
+                 format_info->decompressed_type, decompressed_data.get());
+    state_.RestoreUnpackState();
+  } else {
+    glCompressedTexImage2D(target, level, internal_format, width, height,
+                           border, image_size, data);
+  }
   GLenum error = LOCAL_PEEK_GL_ERROR("glCompressedTexImage2D");
   if (error == GL_NO_ERROR) {
     texture_manager()->SetLevelInfo(texture_ref, target, level, internal_format,
                                     width, height, 1, border, 0, 0,
                                     gfx::Rect(width, height));
   }
 
   // This may be a slow command.  Exit command processing to allow for
   // context preemption and GPU watchdog checks.
   ExitCommandProcessingEarly();
@@ skipping 29 matching lines @@
   if (texture->IsImmutable()) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glCompressedTexImage3D", "texture is immutable");
     return error::kNoError;
   }
 
   if (!ValidateCompressedTexDimensions("glCompressedTexImage3D", target, level,
                                        width, height, depth, internal_format) ||
       !ValidateCompressedTexFuncData("glCompressedTexImage3D", width, height,
-                                     depth, internal_format, image_size)) {
+                                     depth, internal_format, image_size,
+                                     data)) {
     return error::kNoError;
   }
 
   if (!EnsureGPUMemoryAvailable(image_size)) {
     LOCAL_SET_GL_ERROR(
         GL_OUT_OF_MEMORY, "glCompressedTexImage3D", "out of memory");
     return error::kNoError;
   }
 
   if (texture->IsAttachedToFramebuffer()) {
     framebuffer_state_.clear_state_dirty = true;
   }
 
   std::unique_ptr<int8_t[]> zero;
-  if (!data) {
+  if (!state_.bound_pixel_unpack_buffer && !data) {
     zero.reset(new int8_t[image_size]);
     memset(zero.get(), 0, image_size);
     data = zero.get();
   }
   LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER("glCompressedTexImage3D");
-  glCompressedTexImage3D(target, level, internal_format, width, height, depth,
-                         border, image_size, data);
+  const CompressedFormatInfo* format_info =
+      GetCompressedFormatInfo(internal_format);
+  if (format_info != nullptr && !format_info->support_check(*feature_info_)) {
+    std::unique_ptr<uint8_t[]> decompressed_data = DecompressTextureData(
+        state_, *format_info, width, height, depth, image_size, data);
+    if (!decompressed_data) {
+      MarkContextLost(error::kGuilty);
+      group_->LoseContexts(error::kInnocent);
+      return error::kLostContext;
+    }
+    state_.PushTextureDecompressionUnpackState();
+    glTexImage3D(target, level, format_info->decompressed_internal_format,
+                 width, height, depth, border, format_info->decompressed_format,
+                 format_info->decompressed_type, decompressed_data.get());
+    state_.RestoreUnpackState();
+  } else {
+    glCompressedTexImage3D(target, level, internal_format, width, height, depth,
+                           border, image_size, data);
+  }
   GLenum error = LOCAL_PEEK_GL_ERROR("glCompressedTexImage3D");
   if (error == GL_NO_ERROR) {
     texture_manager()->SetLevelInfo(texture_ref, target, level, internal_format,
                                     width, height, depth, border, 0, 0,
                                     gfx::Rect(width, height));
   }
 
   // This may be a slow command.  Exit command processing to allow for
   // context preemption and GPU watchdog checks.
   ExitCommandProcessingEarly();
   return error::kNoError;
 }
 
-void GLES2DecoderImpl::DoCompressedTexSubImage3D(
-    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
-    GLsizei width, GLsizei height, GLsizei depth, GLenum format,
-    GLsizei image_size, const void* data) {
+error::Error GLES2DecoderImpl::DoCompressedTexSubImage3D(GLenum target,
+                                                         GLint level,
+                                                         GLint xoffset,
+                                                         GLint yoffset,
+                                                         GLint zoffset,
+                                                         GLsizei width,
+                                                         GLsizei height,
+                                                         GLsizei depth,
+                                                         GLenum format,
+                                                         GLsizei image_size,
+                                                         const void* data) {
   if (!texture_manager()->ValidForTarget(target, level, width, height, depth)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE,
         "glCompressedTexSubImage3D", "dimensions out of range");
-    return;
+    return error::kNoError;
   }
   TextureRef* texture_ref = texture_manager()->GetTextureInfoForTarget(
       &state_, target);
   if (!texture_ref) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glCompressedTexSubImage3D",
         "unknown texture for target");
-    return;
+    return error::kNoError;
   }
   Texture* texture = texture_ref->texture();
   GLenum type = 0, internal_format = 0;
   if (!texture->GetLevelType(target, level, &type, &internal_format)) {
     std::string msg = base::StringPrintf(
         "level %d does not exist", level);
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glCompressedTexSubImage3D",
                        msg.c_str());
-    return;
+    return error::kNoError;
   }
   if (internal_format != format) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glCompressedTexSubImage3D",
         "format does not match internal format");
-    return;
+    return error::kNoError;
   }
   if (!texture->ValidForTexture(target, level, xoffset, yoffset, zoffset,
                                 width, height, depth)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedTexSubImage3D",
         "bad dimensions");
-    return;
+    return error::kNoError;
   }
-  if (!ValidateCompressedTexFuncData("glCompressedTexSubImage3D",
-                                     width, height, depth, format,
-                                     image_size) ||
-      !ValidateCompressedTexSubDimensions("glCompressedTexSubImage3D",
-                                          target, level, xoffset, yoffset,
-                                          zoffset, width, height, depth,
-                                          format, texture)) {
-    return;
+  if (!ValidateCompressedTexFuncData("glCompressedTexSubImage3D", width, height,
+                                     depth, format, image_size, data) ||
+      !ValidateCompressedTexSubDimensions(
+          "glCompressedTexSubImage3D", target, level, xoffset, yoffset, zoffset,
+          width, height, depth, format, texture)) {
+    return error::kNoError;
   }
 
   // Note: There is no need to deal with texture cleared tracking here
   // because the validation above means you can only get here if the level
   // is already a matching compressed format and in that case
   // CompressedTexImage3D already cleared the texture.
-  glCompressedTexSubImage3D(
-      target, level, xoffset, yoffset, zoffset, width, height, depth, format,
-      image_size, data);
+
+  const CompressedFormatInfo* format_info =
+      GetCompressedFormatInfo(internal_format);
+  if (format_info != nullptr && !format_info->support_check(*feature_info_)) {
+    std::unique_ptr<uint8_t[]> decompressed_data = DecompressTextureData(
+        state_, *format_info, width, height, depth, image_size, data);
+    if (!decompressed_data) {
+      MarkContextLost(error::kGuilty);
+      group_->LoseContexts(error::kInnocent);
+      return error::kLostContext;
+    }
+    state_.PushTextureDecompressionUnpackState();
+    glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height,
+                    depth, format_info->decompressed_format,
+                    format_info->decompressed_type, decompressed_data.get());
+    state_.RestoreUnpackState();
+  } else {
+    glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width,
+                              height, depth, format, image_size, data);
+  }
 
   // This may be a slow command.  Exit command processing to allow for
   // context preemption and GPU watchdog checks.
   ExitCommandProcessingEarly();
+  return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::HandleTexImage2D(uint32_t immediate_data_size,
                                                 const void* cmd_data) {
   const gles2::cmds::TexImage2D& c =
       *static_cast<const gles2::cmds::TexImage2D*>(cmd_data);
   TRACE_EVENT2("gpu", "GLES2DecoderImpl::HandleTexImage2D",
       "width", c.width, "height", c.height);
   // Set as failed for now, but if it successed, this will be set to not failed.
   texture_state_.tex_image_failed = true;
@@ skipping 158 matching lines @@
     TextureManager::DoTexImageArguments::kTexImage3D };
   texture_manager()->ValidateAndDoTexImage(
       &texture_state_, &state_, &framebuffer_state_, "glTexImage3D", args);
 
   // This may be a slow command.  Exit command processing to allow for
   // context preemption and GPU watchdog checks.
   ExitCommandProcessingEarly();
   return error::kNoError;
 }
 
-void GLES2DecoderImpl::DoCompressedTexSubImage2D(
-    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
-    GLsizei height, GLenum format, GLsizei image_size, const void * data) {
+error::Error GLES2DecoderImpl::DoCompressedTexSubImage2D(GLenum target,
+                                                         GLint level,
+                                                         GLint xoffset,
+                                                         GLint yoffset,
+                                                         GLsizei width,
+                                                         GLsizei height,
+                                                         GLenum format,
+                                                         GLsizei image_size,
+                                                         const void* data) {
   TextureRef* texture_ref = texture_manager()->GetTextureInfoForTarget(
       &state_, target);
   if (!texture_ref) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glCompressedTexSubImage2D", "unknown texture for target");
-    return;
+    return error::kNoError;
   }
   if (!texture_manager()->ValidForTarget(target, level, width, height, 1)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE,
         "glCompressedTexSubImage2D", "dimensions out of range");
-    return;
+    return error::kNoError;
   }
   Texture* texture = texture_ref->texture();
   GLenum type = 0;
   GLenum internal_format = 0;
   if (!texture->GetLevelType(target, level, &type, &internal_format)) {
     std::string msg = base::StringPrintf(
         "level %d does not exist", level);
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, "glCompressedTexSubImage2D", msg.c_str());
-    return;
+    return error::kNoError;
   }
   if (internal_format != format) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION,
         "glCompressedTexSubImage2D", "format does not match internal format.");
-    return;
+    return error::kNoError;
   }
   if (!texture->ValidForTexture(target, level, xoffset, yoffset, 0, width,
                                 height, 1)) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_VALUE, "glCompressedTexSubImage2D", "bad dimensions.");
-    return;
+    return error::kNoError;
   }
 
-  if (!ValidateCompressedTexFuncData("glCompressedTexSubImage2D",
-                                     width, height, 1, format, image_size) ||
-      !ValidateCompressedTexSubDimensions("glCompressedTexSubImage2D",
-                                          target, level, xoffset, yoffset, 0,
-                                          width, height, 1, format, texture)) {
-    return;
+  if (!ValidateCompressedTexFuncData("glCompressedTexSubImage2D", width, height,
+                                     1, format, image_size, data) ||
+      !ValidateCompressedTexSubDimensions("glCompressedTexSubImage2D", target,
+                                          level, xoffset, yoffset, 0, width,
+                                          height, 1, format, texture)) {
+    return error::kNoError;
   }
 
   if (!texture->IsLevelCleared(target, level)) {
     // This can only happen if the compressed texture was allocated
     // using TexStorage2D.
     DCHECK(texture->IsImmutable());
     GLsizei level_width = 0, level_height = 0;
     bool success = texture->GetLevelSize(
         target, level, &level_width, &level_height, nullptr);
     DCHECK(success);
     // We can skip the clear if we're uploading the entire level.
     if (xoffset == 0 && yoffset == 0 &&
         width == level_width && height == level_height) {
       texture_manager()->SetLevelCleared(texture_ref, target, level, true);
     } else {
       texture_manager()->ClearTextureLevel(this, texture_ref, target, level);
     }
     DCHECK(texture->IsLevelCleared(target, level));
   }
 
-  glCompressedTexSubImage2D(
-      target, level, xoffset, yoffset, width, height, format, image_size, data);
+  const CompressedFormatInfo* format_info =
+      GetCompressedFormatInfo(internal_format);
+  if (format_info != nullptr && !format_info->support_check(*feature_info_)) {
+    std::unique_ptr<uint8_t[]> decompressed_data = DecompressTextureData(
+        state_, *format_info, width, height, 1, image_size, data);
+    if (!decompressed_data) {
+      MarkContextLost(error::kGuilty);
+      group_->LoseContexts(error::kInnocent);
+      return error::kLostContext;
+    }
+    state_.PushTextureDecompressionUnpackState();
+    glTexSubImage2D(target, level, xoffset, yoffset, width, height,
+                    format_info->decompressed_format,
+                    format_info->decompressed_type, decompressed_data.get());
+    state_.RestoreUnpackState();
+  } else {
+    glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height,
+                              format, image_size, data);
+  }
 
   // This may be a slow command.  Exit command processing to allow for
   // context preemption and GPU watchdog checks.
   ExitCommandProcessingEarly();
+  return error::kNoError;
 }
 
 static void Clip(
     GLint start, GLint range, GLint sourceRange,
     GLint* out_start, GLint* out_range) {
   DCHECK(out_start);
   DCHECK(out_range);
   if (start < 0) {
     range += start;
     start = 0;
@@ skipping 2772 matching lines @@
       if (target == GL_TEXTURE_3D)
         level_depth = std::max(1, level_depth >> 1);
     }
     if (!estimated_size.IsValid() ||
         !EnsureGPUMemoryAvailable(estimated_size.ValueOrDefault(0))) {
       LOCAL_SET_GL_ERROR(GL_OUT_OF_MEMORY, function_name, "out of memory");
       return;
     }
   }
 
+  GLenum compatibility_internal_format = internal_format;
+  const CompressedFormatInfo* format_info =
+      GetCompressedFormatInfo(internal_format);
+  if (format_info != nullptr && !format_info->support_check(*feature_info_)) {
+    compatibility_internal_format = format_info->decompressed_internal_format;
+  }
+
   // TODO(zmo): We might need to emulate TexStorage using TexImage or
   // CompressedTexImage on Mac OSX where we expose ES3 APIs when the underlying
   // driver is lower than 4.2 and ARB_texture_storage extension doesn't exist.
   if (dimension == ContextState::k2D) {
-    glTexStorage2DEXT(target, levels, internal_format, width, height);
+    glTexStorage2DEXT(target, levels, compatibility_internal_format, width,
+                      height);
   } else {
-    glTexStorage3D(target, levels, internal_format, width, height, depth);
+    glTexStorage3D(target, levels, compatibility_internal_format, width, height,
+                   depth);
   }
 
   {
     GLsizei level_width = width;
     GLsizei level_height = height;
     GLsizei level_depth = depth;
     GLenum adjusted_format =
         feature_info_->IsES3Enabled() ? internal_format : format;
     for (int ii = 0; ii < levels; ++ii) {
       if (target == GL_TEXTURE_CUBE_MAP) {
@@ skipping 1988 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