cc: Adding support for RGBA_4444 tile textures

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/alias.h"
@@ skipping 117 matching lines @@
 void TextureUploader::EndQuery() {
   available_queries_.front()->End();
   pending_queries_.push_back(available_queries_.take_front());
   num_blocking_texture_uploads_++;
 }
 
 void TextureUploader::Upload(const uint8* image,
                              gfx::Rect image_rect,
                              gfx::Rect source_rect,
                              gfx::Vector2d dest_offset,
-                             GLenum format,
+                             ResourceProvider::Format format,
                              gfx::Size size) {
   CHECK(image_rect.Contains(source_rect));
 
   bool is_full_upload = dest_offset.IsZero() && source_rect.size() == size;
 
   if (is_full_upload)
     BeginQuery();
 
   if (use_map_tex_sub_image_) {
     UploadWithMapTexSubImage(
         image, image_rect, source_rect, dest_offset, format);
   } else {
-    UploadWithTexSubImage(image, image_rect, source_rect, dest_offset, format);
+    UploadWithTexSubImage(
+        image, image_rect, source_rect, dest_offset, format);
   }
 
   if (is_full_upload)
     EndQuery();
 
   num_texture_uploads_since_last_flush_++;
   if (num_texture_uploads_since_last_flush_ >= kTextureUploadFlushPeriod)
     Flush();
 }
 
 void TextureUploader::Flush() {
   if (!num_texture_uploads_since_last_flush_)
     return;
 
   if (use_shallow_flush_)
     context_->shallowFlushCHROMIUM();
 
   num_texture_uploads_since_last_flush_ = 0;
 }
 
 void TextureUploader::ReleaseCachedQueries() {
   ProcessQueries();
   available_queries_.clear();
 }
 
-void TextureUploader::UploadWithTexSubImage(const uint8* image,
-                                            gfx::Rect image_rect,
-                                            gfx::Rect source_rect,
-                                            gfx::Vector2d dest_offset,
-                                            GLenum format) {
+void TextureUploader::UploadWithTexSubImage(
+    const uint8* image,
+    gfx::Rect image_rect,
+    gfx::Rect source_rect,
+    gfx::Vector2d dest_offset,
+    ResourceProvider::Format format) {
   // Instrumentation to debug issue 156107
   int source_rect_x = source_rect.x();
   int source_rect_y = source_rect.y();
   int source_rect_width = source_rect.width();
   int source_rect_height = source_rect.height();
   int image_rect_x = image_rect.x();
   int image_rect_y = image_rect.y();
   int image_rect_width = image_rect.width();
   int image_rect_height = image_rect.height();
   int dest_offset_x = dest_offset.x();
   int dest_offset_y = dest_offset.y();
   base::debug::Alias(&image);
   base::debug::Alias(&source_rect_x);
   base::debug::Alias(&source_rect_y);
   base::debug::Alias(&source_rect_width);
   base::debug::Alias(&source_rect_height);
   base::debug::Alias(&image_rect_x);
   base::debug::Alias(&image_rect_y);
   base::debug::Alias(&image_rect_width);
   base::debug::Alias(&image_rect_height);
   base::debug::Alias(&dest_offset_x);
   base::debug::Alias(&dest_offset_y);
   TRACE_EVENT0("cc", "TextureUploader::UploadWithTexSubImage");
 
   // Offset from image-rect to source-rect.
   gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
   const uint8* pixel_source;
-  unsigned int bytes_per_pixel = Resource::BytesPerPixel(format);
-  // Use 4-byte row alignment (OpenGL default) for upload performance.
-  // Assuming that GL_UNPACK_ALIGNMENT has not changed from default.
+  unsigned int bytes_per_pixel = ResourceProvider::BytesPerPixel(format);
+  DCHECK(format != ResourceProvider::RGBA_4444 ||
+         (source_rect.width() % 2) == 0);
   unsigned int upload_image_stride =
-      RoundUp(bytes_per_pixel * source_rect.width(), 4u);
+      RoundUp(bytes_per_pixel * source_rect.width(),
+              ResourceProvider::GetStride(format));

[piman, 2013/09/13 04:56:51]

I don't understand the change here, to accomodate 4444.
1- You check that source_rect.width() is multiple of 2. Since bytes_per_pixel is
2, then bytes_per_pixel*source_rect.width() is a multiple of 4 still.
2- if it wasn't, then you'd have a problem anyway. You're not changing the
GL_UNPACK_ALIGNMENT, so if rows were not aligned on 4 bytes, you'd corrupt the
upload and access invalid data.

So leaving it at 4 is actually more correct, and doesn't need the GetStride.

[kaanb, 2013/09/13 19:57:39]

Done.

 
   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();
     if (sub_image_size_ < needed_size) {
       sub_image_.reset(new uint8[needed_size]);
       sub_image_size_ = needed_size;
     }
     // Strides not equal, so do a row-by-row memcpy from the
     // paint results into a temp buffer for uploading.
     for (int row = 0; row < source_rect.height(); ++row)
       memcpy(&sub_image_[upload_image_stride * row],
              &image[bytes_per_pixel *
                  (offset.x() + (offset.y() + row) * image_rect.width())],
              source_rect.width() * bytes_per_pixel);
 
     pixel_source = &sub_image_[0];
   }
 
   context_->texSubImage2D(GL_TEXTURE_2D,
                           0,
                           dest_offset.x(),
                           dest_offset.y(),
                           source_rect.width(),
                           source_rect.height(),
-                          format,
-                          GL_UNSIGNED_BYTE,
+                          ResourceProvider::GetGLDataFormat(format),
+                          ResourceProvider::GetGLDataType(format),
                           pixel_source);
 }
 
-void TextureUploader::UploadWithMapTexSubImage(const uint8* image,
-                                               gfx::Rect image_rect,
-                                               gfx::Rect source_rect,
-                                               gfx::Vector2d dest_offset,
-                                               GLenum format) {
+void TextureUploader::UploadWithMapTexSubImage(
+    const uint8* image,
+    gfx::Rect image_rect,
+    gfx::Rect source_rect,
+    gfx::Vector2d dest_offset,
+    ResourceProvider::Format format) {
   // Instrumentation to debug issue 156107
   int source_rect_x = source_rect.x();
   int source_rect_y = source_rect.y();
   int source_rect_width = source_rect.width();
   int source_rect_height = source_rect.height();
   int image_rect_x = image_rect.x();
   int image_rect_y = image_rect.y();
   int image_rect_width = image_rect.width();
   int image_rect_height = image_rect.height();
   int dest_offset_x = dest_offset.x();
   int dest_offset_y = dest_offset.y();
   base::debug::Alias(&image);
   base::debug::Alias(&source_rect_x);
   base::debug::Alias(&source_rect_y);
   base::debug::Alias(&source_rect_width);
   base::debug::Alias(&source_rect_height);
   base::debug::Alias(&image_rect_x);
   base::debug::Alias(&image_rect_y);
   base::debug::Alias(&image_rect_width);
   base::debug::Alias(&image_rect_height);
   base::debug::Alias(&dest_offset_x);
   base::debug::Alias(&dest_offset_y);
 
   TRACE_EVENT0("cc", "TextureUploader::UploadWithMapTexSubImage");
 
   // Offset from image-rect to source-rect.
   gfx::Vector2d offset(source_rect.origin() - image_rect.origin());
 
-  unsigned int bytes_per_pixel = Resource::BytesPerPixel(format);
-  // Use 4-byte row alignment (OpenGL default) for upload performance.
-  // Assuming that GL_UNPACK_ALIGNMENT has not changed from default.
+  unsigned int bytes_per_pixel = ResourceProvider::BytesPerPixel(format);

[enne (OOO), 2013/09/13 01:39:44]

unsigned int => size_t, here and elsewhere.

[kaanb, 2013/09/13 03:43:56]

Done.

+  DCHECK(format != ResourceProvider::RGBA_4444 ||
+         (source_rect.width() % 2) == 0);
   unsigned int upload_image_stride =
-      RoundUp(bytes_per_pixel * source_rect.width(), 4u);
+      RoundUp(bytes_per_pixel * source_rect.width(),
+              ResourceProvider::GetStride(format));
 
-  // Upload tile data via a mapped transfer buffer
   uint8* pixel_dest = static_cast<uint8*>(
       context_->mapTexSubImage2DCHROMIUM(GL_TEXTURE_2D,
                                          0,
                                          dest_offset.x(),
                                          dest_offset.y(),
                                          source_rect.width(),
                                          source_rect.height(),
-                                         format,
-                                         GL_UNSIGNED_BYTE,
+                                         ResourceProvider::GetGLDataFormat(
+                                             format),
+                                         ResourceProvider::GetGLDataType(
+                                             format),
                                          GL_WRITE_ONLY));
 
   if (!pixel_dest) {
     UploadWithTexSubImage(image, image_rect, source_rect, dest_offset, format);
     return;
   }
 
   if (upload_image_stride == image_rect.width() * bytes_per_pixel &&
       !offset.x()) {
     memcpy(pixel_dest,
@@ skipping 35 matching lines @@
       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