cc: Adding ETC1 support to UIResourceBitmap and ResourceProvider

cc/scheduler/texture_uploader.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/scheduler/texture_uploader.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/debug/trace_event.h"
@@ skipping 58 matching lines @@
 unsigned TextureUploader::Query::Value() {
   if (!has_value_) {
     context_->getQueryObjectuivEXT(query_id_, GL_QUERY_RESULT_EXT, &value_);
     has_value_ = true;
   }
   return value_;
 }
 
 TextureUploader::TextureUploader(WebKit::WebGraphicsContext3D* context,
                                  bool use_map_tex_sub_image,
-                                 bool use_shallow_flush)
+                                 bool use_shallow_flush,
+                                 bool use_compressed_texture_etc1)
     : context_(context),
       num_blocking_texture_uploads_(0),
       use_map_tex_sub_image_(use_map_tex_sub_image),
       sub_image_size_(0),
       use_shallow_flush_(use_shallow_flush),
-      num_texture_uploads_since_last_flush_(0) {
+      num_texture_uploads_since_last_flush_(0),
+      use_compressed_texture_etc1_(use_compressed_texture_etc1) {

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

nit: I'd rename this to 'have_compressed_texture_etc1_' since it's not really
used to chose an alternate codepath like the flags above. You might also just
remove it from this class since you are only using it for a DCHECK(). The the
decoder would already generate a GL error if you tried to use the format where
the extension is not available and the function call is explicit enough
(UploadWithTexSubImageETC1).

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

Done.  Removed.

   for (size_t i = kUploadHistorySizeInitial; i > 0; i--)
     textures_per_second_history_.insert(kDefaultEstimatedTexturesPerSecond);
 }
 
 TextureUploader::~TextureUploader() {}
 
 size_t TextureUploader::NumBlockingUploads() {
   ProcessQueries();
   return num_blocking_texture_uploads_;
 }
@@ skipping 83 matching lines @@
                                             gfx::Vector2d dest_offset,
                                             ResourceFormat format) {
   TRACE_EVENT0("cc", "TextureUploader::UploadWithTexSubImage");
 
   // Early-out if this is a no-op, and assert that |image| be valid if this is
   // not a no-op.
   if (source_rect.IsEmpty())
     return;
   DCHECK(image);
 
+  if (format == ETC1) {
+    UploadWithTexSubImageETC1(
+        image, image_rect, source_rect, dest_offset, format);
+    return;
+  }
+
   // Offset from image-rect to source-rect.
   gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
   const uint8* pixel_source;
-  unsigned bytes_per_pixel = BytesPerPixel(format);
+  unsigned bytes_per_pixel = BitsPerPixel(format) / 8;

[kaanb, 2013/10/23 20:30:09]

could you keep a BytesPerPixel method in resource_provider.h that simply returns
BitsPerPixel(format) / 8 

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

Done.

   // Use 4-byte row alignment (OpenGL default) for upload performance.
   // Assuming that GL_UNPACK_ALIGNMENT has not changed from default.
   unsigned upload_image_stride =
       RoundUp(bytes_per_pixel * source_rect.width(), 4u);
 
   if (upload_image_stride == image_rect.width() * bytes_per_pixel &&
       !offset.x()) {
     pixel_source = &image[image_rect.width() * bytes_per_pixel * offset.y()];
   } else {
     size_t needed_size = upload_image_stride * source_rect.height();
@@ skipping 28 matching lines @@
                                                gfx::Rect source_rect,
                                                gfx::Vector2d dest_offset,
                                                ResourceFormat format) {
   TRACE_EVENT0("cc", "TextureUploader::UploadWithMapTexSubImage");
 
   // Early-out if this is a no-op, and assert that |image| be valid if this is
   // not a no-op.
   if (source_rect.IsEmpty())
     return;
   DCHECK(image);
+  // Compressed textures have no implementation of mapTexSubImage.
+  DCHECK_NE(ETC1, format);
 
   // Offset from image-rect to source-rect.
   gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
-  unsigned bytes_per_pixel = BytesPerPixel(format);
+  unsigned bytes_per_pixel = BitsPerPixel(format) / 8;
   // Use 4-byte row alignment (OpenGL default) for upload performance.
   // Assuming that GL_UNPACK_ALIGNMENT has not changed from default.
   unsigned upload_image_stride =
       RoundUp(bytes_per_pixel * source_rect.width(), 4u);
 
   // Upload tile data via a mapped transfer buffer
   uint8* pixel_dest = static_cast<uint8*>(
       context_->mapTexSubImage2DCHROMIUM(GL_TEXTURE_2D,
                                          0,
                                          dest_offset.x(),
@@ skipping 21 matching lines @@
       memcpy(&pixel_dest[upload_image_stride * row],
              &image[bytes_per_pixel *
                  (offset.x() + (offset.y() + row) * image_rect.width())],
              source_rect.width() * bytes_per_pixel);
     }
   }
 
   context_->unmapTexSubImage2DCHROMIUM(pixel_dest);
 }
 
+void TextureUploader::UploadWithTexSubImageETC1(const uint8* image,
+                                                gfx::Rect image_rect,
+                                                gfx::Rect source_rect,
+                                                gfx::Vector2d dest_offset,
+                                                ResourceFormat format) {
+  TRACE_EVENT0("cc", "TextureUploader::UploadWithTexSubImageETC1");
+  DCHECK(use_compressed_texture_etc1_);
+  // ETC1 does not support subimage uploads yet.
+  DCHECK(image_rect == source_rect);
+  DCHECK_EQ(0, dest_offset.x());
+  DCHECK_EQ(0, dest_offset.y());
+
+  gfx::Size size = source_rect.size();
+  DCHECK_EQ(0, size.width() % 4);
+  DCHECK_EQ(0, size.height() % 4);
+
+  context_->compressedTexSubImage2D(

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

Wait, I'm confused. Like your comment says above, texSubImage does not work with
ETC1.
The spec does not support it, and there is even a unit test
(GLES2DecoderManualInitTest.CompressedTexImage2DETC1, see 'Test
CompressedTexSubImage not allowed'). 

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

Done.  My comment above was to discourage users from using subimage uploads on
an etc1 resource, but I did not know that this is not even supported.  I've
changed it to just compressedTexImage2D.

+      GL_TEXTURE_2D,
+      0, /* level */
+      0, /* x */
+      0, /* y */
+      size.width(),
+      size.height(),
+      GLDataFormat(format),
+      Resource::MemorySizeBytes(size, format),
+      image);
+}
+
 void TextureUploader::ProcessQueries() {
   while (!pending_queries_.empty()) {
     if (pending_queries_.front()->IsPending())
       break;
 
     unsigned us_elapsed = pending_queries_.front()->Value();
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Renderer4.TextureGpuUploadTimeUS", us_elapsed, 0, 100000, 50);
 
     // Clamp the queries to saner values in case the queries fail.
     us_elapsed = std::max(1u, us_elapsed);
     us_elapsed = std::min(15000u, us_elapsed);
 
     if (!pending_queries_.front()->is_non_blocking())
       num_blocking_texture_uploads_--;
 
     // Remove the min and max value from our history and insert the new one.
     double textures_per_second = 1.0 / (us_elapsed * 1e-6);
     if (textures_per_second_history_.size() >= kUploadHistorySizeMax) {
       textures_per_second_history_.erase(textures_per_second_history_.begin());
       textures_per_second_history_.erase(--textures_per_second_history_.end());
     }
     textures_per_second_history_.insert(textures_per_second);
 
     available_queries_.push_back(pending_queries_.take_front());
   }
 }
 
 }  // namespace cc