cc: Adding ETC1 support to UIResourceBitmap and ResourceProvider

cc/resources/resource_provider.cc

 // Copyright 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 "cc/resources/resource_provider.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/containers/hash_tables.h"
@@ skipping 24 matching lines @@
 const double kTextureUploadTickRate = 0.004;
 
 GLenum TextureToStorageFormat(ResourceFormat format) {
   GLenum storage_format = GL_RGBA8_OES;
   switch (format) {
     case RGBA_8888:
       break;
     case BGRA_8888:
       storage_format = GL_BGRA8_EXT;
       break;
+    case ETC1:
     case RGBA_4444:
     case LUMINANCE_8:
     case RGB_565:
       NOTREACHED();
       break;
   }
 
   return storage_format;
 }
 
 bool IsFormatSupportedForStorage(ResourceFormat format) {
   switch (format) {
     case RGBA_8888:
     case BGRA_8888:
       return true;
+    case ETC1:
     case RGBA_4444:
     case LUMINANCE_8:
     case RGB_565:
       return false;
   }
   return false;
 }
 
 class ScopedSetActiveTexture {
  public:
@@ skipping 726 matching lines @@
   default_resource_type_ = GLTexture;
 
   const ContextProvider::Capabilities& caps =
       output_surface_->context_provider()->ContextCapabilities();
 
   bool use_map_sub = caps.map_sub;
   bool use_bgra = caps.texture_format_bgra8888;
   use_texture_storage_ext_ = caps.texture_storage;
   use_shallow_flush_ = caps.shallow_flush;
   use_texture_usage_hint_ = caps.texture_usage;
+  use_compressed_texture_etc1_ = caps.texture_format_etc1;
 
-  texture_uploader_ =
-      TextureUploader::Create(context3d, use_map_sub, use_shallow_flush_);
+  texture_uploader_ = TextureUploader::Create(
+      context3d, use_map_sub, use_shallow_flush_, use_compressed_texture_etc1_);
   GLC(context3d, context3d->getIntegerv(GL_MAX_TEXTURE_SIZE,
                                         &max_texture_size_));
   best_texture_format_ = PlatformColor::BestTextureFormat(use_bgra);
 
   return true;
 }
 
 void ResourceProvider::CleanUpGLIfNeeded() {
   WebGraphicsContext3D* context3d = Context3d();
   if (default_resource_type_ != GLTexture) {
@@ skipping 384 matching lines @@
 
   if (!to_return.empty())
     child_info->return_callback.Run(to_return);
 }
 
 void ResourceProvider::AcquirePixelBuffer(ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK(!resource->external);
   DCHECK_EQ(resource->exported_count, 0);
   DCHECK(!resource->image_id);
+  DCHECK_NE(ETC1, resource->format);
 
   if (resource->type == GLTexture) {
     WebGraphicsContext3D* context3d = Context3d();
     DCHECK(context3d);
     if (!resource->gl_pixel_buffer_id)
       resource->gl_pixel_buffer_id = context3d->createBuffer();
     context3d->bindBuffer(
         GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM,
         resource->gl_pixel_buffer_id);
-    unsigned bytes_per_pixel = BytesPerPixel(resource->format);
+    unsigned bytes_per_pixel = BitsPerPixel(resource->format) / 8;
     context3d->bufferData(
         GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM,
         resource->size.height() * RoundUp(bytes_per_pixel
             * resource->size.width(), 4u),
         NULL,
         GL_DYNAMIC_DRAW);
     context3d->bindBuffer(GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, 0);
   }
 
   if (resource->pixels) {
@@ skipping 127 matching lines @@
 
 void ResourceProvider::BeginSetPixels(ResourceId id) {
   Resource* resource = GetResource(id);
   DCHECK(!resource->pending_set_pixels);
 
   LazyCreate(resource);
   DCHECK(resource->gl_id || resource->allocated);
   DCHECK(ReadLockFenceHasPassed(resource));
   DCHECK(!resource->image_id);
 
+  gfx::Size& size = resource->size;

[aelias_OOO_until_Jul13, 2013/10/23 19:54:07]

Please delete the "&", it doesn't look like you're using this as a non-const
ref.

[powei, 2013/10/23 22:20:07]

Done.

   bool allocate = !resource->allocated;
   resource->allocated = true;
   LockForWrite(id);
 
   if (resource->gl_id) {
     WebGraphicsContext3D* context3d = Context3d();
     DCHECK(context3d);
     DCHECK(resource->gl_pixel_buffer_id);
     DCHECK_EQ(resource->target, static_cast<GLenum>(GL_TEXTURE_2D));
     context3d->bindTexture(GL_TEXTURE_2D, resource->gl_id);
     context3d->bindBuffer(
         GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM,
         resource->gl_pixel_buffer_id);
     if (!resource->gl_upload_query_id)
       resource->gl_upload_query_id = context3d->createQueryEXT();
     context3d->beginQueryEXT(
         GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM,
         resource->gl_upload_query_id);
     if (allocate) {

[no sievers, 2013/10/23 20:33:15]

I think the change in here is wrong. Don't the UI resource uploads go through
ResourceProvider::SetPixels()? Why do you need to change this function?

[powei, 2013/10/23 22:20:07]

Done.  Removed.  You're right.  I got careless and just added ETC1 path
everywhere I see texImage.  

-      context3d->asyncTexImage2DCHROMIUM(
-          GL_TEXTURE_2D,
-          0, /* level */
-          GLInternalFormat(resource->format),
-          resource->size.width(),
-          resource->size.height(),
-          0, /* border */
-          GLDataFormat(resource->format),
-          GLDataType(resource->format),
-          NULL);
+      if (resource->format == ETC1) {
+        DCHECK(use_compressed_texture_etc1_);
+        DCHECK_EQ(0, size.width() % 4);
+        DCHECK_EQ(0, size.height() % 4);
+        context3d->compressedTexImage2D(
+            GL_TEXTURE_2D,
+            0, /* level */
+            GLInternalFormat(resource->format),
+            size.width(),
+            size.height(),
+            0, /* border */
+            cc::Resource::MemorySizeBytes(size, resource->format),
+            NULL);
+      } else {
+        context3d->asyncTexImage2DCHROMIUM(
+            GL_TEXTURE_2D,
+            0, /* level */
+            GLInternalFormat(resource->format),
+            size.width(),
+            size.height(),
+            0, /* border */
+            GLDataFormat(resource->format),
+            GLDataType(resource->format),
+            NULL);
+      }
     } else {
-      context3d->asyncTexSubImage2DCHROMIUM(
-          GL_TEXTURE_2D,
-          0, /* level */
-          0, /* x */
-          0, /* y */
-          resource->size.width(),
-          resource->size.height(),
-          GLDataFormat(resource->format),
-          GLDataType(resource->format),
-          NULL);
+      if (resource->format == ETC1) {
+        DCHECK(use_compressed_texture_etc1_);
+        DCHECK_EQ(0, size.width() % 4);
+        DCHECK_EQ(0, size.height() % 4);
+        context3d->compressedTexSubImage2D(
+            GL_TEXTURE_2D,
+            0, /* level */
+            0, /* x */
+            0, /* y */
+            size.width(),
+            size.height(),
+            GLDataFormat(resource->format),
+            cc::Resource::MemorySizeBytes(size, resource->format),
+            NULL);
+      } else {
+        context3d->asyncTexSubImage2DCHROMIUM(
+            GL_TEXTURE_2D,
+            0, /* level */
+            0, /* x */
+            0, /* y */
+            size.width(),
+            size.height(),
+            GLDataFormat(resource->format),
+            GLDataType(resource->format),
+            NULL);
+      }
     }
     context3d->endQueryEXT(GL_ASYNC_PIXEL_UNPACK_COMPLETED_CHROMIUM);
     context3d->bindBuffer(GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM, 0);
   }
 
   if (resource->pixels) {
     DCHECK(!resource->mailbox.IsValid());
     DCHECK(resource->pixel_buffer);
     DCHECK_EQ(RGBA_8888, resource->format);
 
@@ skipping 115 matching lines @@
   ResourceFormat format = resource->format;
   GLC(context3d, context3d->bindTexture(GL_TEXTURE_2D, resource->gl_id));
   if (use_texture_storage_ext_ && IsFormatSupportedForStorage(format)) {
     GLenum storage_format = TextureToStorageFormat(format);
     GLC(context3d, context3d->texStorage2DEXT(GL_TEXTURE_2D,
                                               1,
                                               storage_format,
                                               size.width(),
                                               size.height()));
   } else {
-    GLC(context3d, context3d->texImage2D(GL_TEXTURE_2D,
-                                         0,
-                                         GLInternalFormat(format),
-                                         size.width(),
-                                         size.height(),
-                                         0,
-                                         GLDataFormat(format),
-                                         GLDataType(format),
-                                         NULL));
+    if (format == ETC1) {
+      DCHECK(use_compressed_texture_etc1_);
+      DCHECK_EQ(0, size.width() % 4);
+      DCHECK_EQ(0, size.height() % 4);
+      GLC(context3d,
+          context3d->compressedTexImage2D(
+              GL_TEXTURE_2D,
+              0,
+              GLInternalFormat(format),
+              size.width(),
+              size.height(),
+              0,
+              cc::Resource::MemorySizeBytes(size, format),
+              NULL));
+    } else {
+      GLC(context3d,
+          context3d->texImage2D(GL_TEXTURE_2D,
+                                0,
+                                GLInternalFormat(format),
+                                size.width(),
+                                size.height(),
+                                0,
+                                GLDataFormat(format),
+                                GLDataType(format),
+                                NULL));
+    }
   }
 }
 
 void ResourceProvider::EnableReadLockFences(ResourceProvider::ResourceId id,
                                             bool enable) {
   Resource* resource = GetResource(id);
   resource->enable_read_lock_fences = enable;
 }
 
 void ResourceProvider::AcquireImage(ResourceId id) {
@@ skipping 87 matching lines @@
   context->getIntegerv(GL_ACTIVE_TEXTURE, &active_unit);
   return active_unit;
 }
 
 WebKit::WebGraphicsContext3D* ResourceProvider::Context3d() const {
   ContextProvider* context_provider = output_surface_->context_provider();
   return context_provider ? context_provider->Context3d() : NULL;
 }
 
 }  // namespace cc