cc: Adding support for RGBA_4444 tile textures

cc/scheduler/texture_uploader.cc

Index: cc/scheduler/texture_uploader.cc
diff --git a/cc/scheduler/texture_uploader.cc b/cc/scheduler/texture_uploader.cc
index 920c38e669275d0992d6b5166a1683464aecaad4..422244d1bb5cd6cbad615708ca9200295582337e 100644
--- a/cc/scheduler/texture_uploader.cc
+++ b/cc/scheduler/texture_uploader.cc
@@ -135,7 +135,7 @@ void TextureUploader::Upload(const uint8* image,
                              gfx::Rect image_rect,
                              gfx::Rect source_rect,
                              gfx::Vector2d dest_offset,
-                             GLenum format,
+                             ResourceFormat format,
                              gfx::Size size) {
   CHECK(image_rect.Contains(source_rect));
 
@@ -178,7 +178,7 @@ void TextureUploader::UploadWithTexSubImage(const uint8* image,
                                             gfx::Rect image_rect,
                                             gfx::Rect source_rect,
                                             gfx::Vector2d dest_offset,
-                                            GLenum format) {
+                                            ResourceFormat format) {
   // Instrumentation to debug issue 156107
   int source_rect_x = source_rect.x();
   int source_rect_y = source_rect.y();
@@ -207,11 +207,10 @@ void TextureUploader::UploadWithTexSubImage(const uint8* image,
   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.
+  size_t bytes_per_pixel = ResourceProvider::BytesPerPixel(format);
+  DCHECK(format != RGBA_4444 || (source_rect.width() % 2) == 0);

[reveman, 2013/09/17 02:48:12]

is this format specific dcheck required? Minimum amount of format specific code
is preferred.

[kaanb, 2013/09/17 04:12:18]

There are unittests that upload odd-sized textures (I think 13x13) in RGBA
format.

   unsigned int upload_image_stride =
-      RoundUp(bytes_per_pixel * source_rect.width(), 4u);
+      RoundUp(bytes_per_pixel * source_rect.width(), static_cast<size_t>(4));
 
   if (upload_image_stride == image_rect.width() * bytes_per_pixel &&
       !offset.x()) {
@@ -239,8 +238,8 @@ void TextureUploader::UploadWithTexSubImage(const uint8* image,
                           dest_offset.y(),
                           source_rect.width(),
                           source_rect.height(),
-                          format,
-                          GL_UNSIGNED_BYTE,
+                          ResourceProvider::GetGLDataFormat(format),
+                          ResourceProvider::GetGLDataType(format),
                           pixel_source);
 }
 
@@ -248,7 +247,7 @@ void TextureUploader::UploadWithMapTexSubImage(const uint8* image,
                                                gfx::Rect image_rect,
                                                gfx::Rect source_rect,
                                                gfx::Vector2d dest_offset,
-                                               GLenum format) {
+                                               ResourceFormat format) {
   // Instrumentation to debug issue 156107
   int source_rect_x = source_rect.x();
   int source_rect_y = source_rect.y();
@@ -277,11 +276,10 @@ void TextureUploader::UploadWithMapTexSubImage(const uint8* image,
   // 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.
+  size_t bytes_per_pixel = ResourceProvider::BytesPerPixel(format);
+  DCHECK(format != RGBA_4444 || (source_rect.width() % 2) == 0);

[reveman, 2013/09/17 02:48:12]

same thing here. do we need this format specific dcheck?

[kaanb, 2013/09/17 04:12:18]

Same answer.

   unsigned int upload_image_stride =
-      RoundUp(bytes_per_pixel * source_rect.width(), 4u);
+      RoundUp(bytes_per_pixel * source_rect.width(), static_cast<size_t>(4));
 
   // Upload tile data via a mapped transfer buffer
   uint8* pixel_dest = static_cast<uint8*>(
@@ -291,8 +289,10 @@ void TextureUploader::UploadWithMapTexSubImage(const uint8* image,
                                          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) {