cc: Adding support for RGBA_4444 tile textures

cc/output/renderer_pixeltest.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 "base/message_loop/message_loop.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
-#include "cc/resources/platform_color.h"
 #include "cc/resources/sync_point_helper.h"
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/pixel_test.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/effects/SkColorFilterImageFilter.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
 #include "ui/gfx/rect_conversions.h"
@@ skipping 82 matching lines @@
     SharedQuadState* shared_state,
     ResourceProvider* resource_provider) {
   SkPMColor pixel_color = premultiplied_alpha ?
       SkPreMultiplyColor(texel_color) :
       SkPackARGB32NoCheck(SkColorGetA(texel_color),
                           SkColorGetR(texel_color),
                           SkColorGetG(texel_color),
                           SkColorGetB(texel_color));
   std::vector<uint32_t> pixels(rect.size().GetArea(), pixel_color);
 
-  ResourceProvider::ResourceId resource = resource_provider->CreateResource(
-      rect.size(), GL_RGBA, GL_CLAMP_TO_EDGE,
-      ResourceProvider::TextureUsageAny);
+  ResourceProvider::ResourceId resource =
+      resource_provider->CreateResource(rect.size(),
+                                        GL_CLAMP_TO_EDGE,
+                                        ResourceProvider::TextureUsageAny,
+                                        RGBA_8888);
   resource_provider->SetPixels(
       resource,
       reinterpret_cast<uint8_t*>(&pixels.front()),
       rect,
       rect,
       gfx::Vector2d());
 
   float vertex_opacity[4] = {1.0f, 1.0f, 1.0f, 1.0f};
 
   scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create();
@@ skipping 275 matching lines @@
 class VideoGLRendererPixelTest : public GLRendererPixelTest {
  protected:
   scoped_ptr<YUVVideoDrawQuad> CreateTestYUVVideoDrawQuad(
       SharedQuadState* shared_state, bool with_alpha, bool is_transparent) {
     gfx::Rect rect(this->device_viewport_size_);
     gfx::Rect opaque_rect(0, 0, 0, 0);
 
     ResourceProvider::ResourceId y_resource =
         resource_provider_->CreateResource(
             this->device_viewport_size_,
-            GL_LUMINANCE,
             GL_CLAMP_TO_EDGE,
-            ResourceProvider::TextureUsageAny);
+            ResourceProvider::TextureUsageAny,
+            LUMINANCE_8);
     ResourceProvider::ResourceId u_resource =
         resource_provider_->CreateResource(
             this->device_viewport_size_,
-            GL_LUMINANCE,
             GL_CLAMP_TO_EDGE,
-            ResourceProvider::TextureUsageAny);
+            ResourceProvider::TextureUsageAny,
+            LUMINANCE_8);
     ResourceProvider::ResourceId v_resource =
         resource_provider_->CreateResource(
             this->device_viewport_size_,
-            GL_LUMINANCE,
             GL_CLAMP_TO_EDGE,
-            ResourceProvider::TextureUsageAny);
+            ResourceProvider::TextureUsageAny,
+            LUMINANCE_8);
     ResourceProvider::ResourceId a_resource = 0;
     if (with_alpha) {
       a_resource = resource_provider_->CreateResource(
                        this->device_viewport_size_,
-                       GL_LUMINANCE,
                        GL_CLAMP_TO_EDGE,
-                       ResourceProvider::TextureUsageAny);
+                       ResourceProvider::TextureUsageAny,
+                       LUMINANCE_8);
     }
 
     int w = this->device_viewport_size_.width();
     int h = this->device_viewport_size_.height();
     const int y_plane_size = w * h;
     gfx::Rect uv_rect((w + 1) / 2, (h + 1) / 2);
     const int uv_plane_size = uv_rect.size().GetArea();
     scoped_ptr<uint8_t[]> y_plane(new uint8_t[y_plane_size]);
     scoped_ptr<uint8_t[]> u_plane(new uint8_t[uv_plane_size]);
     scoped_ptr<uint8_t[]> v_plane(new uint8_t[uv_plane_size]);
@@ skipping 915 matching lines @@
       PixelTest::NoOffscreenContext,
       base::FilePath(FILE_PATH_LITERAL("anti_aliasing_perspective.png")),
       FuzzyPixelOffByOneComparator(true)));
 }
 
 TYPED_TEST(RendererPixelTestWithSkiaGPUBackend, PictureDrawQuadIdentityScale) {
   gfx::Size pile_tile_size(1000, 1000);
   gfx::Rect viewport(this->device_viewport_size_);
   bool use_skia_gpu_backend = this->UseSkiaGPUBackend();
   // TODO(enne): the renderer should figure this out on its own.
-  bool contents_swizzled = !PlatformColor::SameComponentOrder(GL_RGBA);
+  ResourceFormat texture_format = RGBA_8888;
 
   RenderPass::Id id(1, 1);
   gfx::Transform transform_to_root;
   scoped_ptr<RenderPass> pass =
       CreateTestRenderPass(id, viewport, transform_to_root);
 
   // One clipped blue quad in the lower right corner.  Outside the clip
   // is red, which should not appear.
   gfx::Rect blue_rect(gfx::Size(100, 100));
   gfx::Rect blue_clip_rect(gfx::Point(50, 50), gfx::Size(50, 50));
@@ skipping 17 matching lines @@
                                        blue_rect,
                                        gfx::ToEnclosingRect(blue_scissor_rect));
 
   scoped_ptr<PictureDrawQuad> blue_quad = PictureDrawQuad::Create();
 
   blue_quad->SetNew(blue_shared_state.get(),
                     viewport,  // Intentionally bigger than clip.
                     gfx::Rect(),
                     viewport,
                     viewport.size(),
-                    contents_swizzled,
+                    texture_format,
                     viewport,
                     1.f,
                     use_skia_gpu_backend,
                     blue_pile);
   pass->quad_list.push_back(blue_quad.PassAs<DrawQuad>());
 
   // One viewport-filling green quad.
   scoped_refptr<FakePicturePileImpl> green_pile =
       FakePicturePileImpl::CreateFilledPile(pile_tile_size, viewport.size());
   SkPaint green_paint;
   green_paint.setColor(SK_ColorGREEN);
   green_pile->add_draw_rect_with_paint(viewport, green_paint);
   green_pile->RerecordPile();
 
   gfx::Transform green_content_to_target_transform;
   scoped_ptr<SharedQuadState> green_shared_state =
       CreateTestSharedQuadState(green_content_to_target_transform, viewport);
 
   scoped_ptr<PictureDrawQuad> green_quad = PictureDrawQuad::Create();
   green_quad->SetNew(green_shared_state.get(),
                      viewport,
                      gfx::Rect(),
                      gfx::RectF(0.f, 0.f, 1.f, 1.f),
                      viewport.size(),
-                     contents_swizzled,
+                     texture_format,
                      viewport,
                      1.f,
                      use_skia_gpu_backend,
                      green_pile);
   pass->quad_list.push_back(green_quad.PassAs<DrawQuad>());
 
   RenderPassList pass_list;
   pass_list.push_back(pass.Pass());
 
   EXPECT_TRUE(this->RunPixelTest(
       &pass_list,
       PixelTest::NoOffscreenContext,
       base::FilePath(FILE_PATH_LITERAL("green_with_blue_corner.png")),
       ExactPixelComparator(true)));
 }
 
 // Not WithSkiaGPUBackend since that path currently requires tiles for opacity.
 TYPED_TEST(RendererPixelTest, PictureDrawQuadOpacity) {
   gfx::Size pile_tile_size(1000, 1000);
   gfx::Rect viewport(this->device_viewport_size_);
   bool use_skia_gpu_backend = this->UseSkiaGPUBackend();
-  bool contents_swizzled = !PlatformColor::SameComponentOrder(GL_RGBA);
+  ResourceFormat texture_format = RGBA_8888;
 
   RenderPass::Id id(1, 1);
   gfx::Transform transform_to_root;
   scoped_ptr<RenderPass> pass =
       CreateTestRenderPass(id, viewport, transform_to_root);
 
   // One viewport-filling 0.5-opacity green quad.
   scoped_refptr<FakePicturePileImpl> green_pile =
       FakePicturePileImpl::CreateFilledPile(pile_tile_size, viewport.size());
   SkPaint green_paint;
   green_paint.setColor(SK_ColorGREEN);
   green_pile->add_draw_rect_with_paint(viewport, green_paint);
   green_pile->RerecordPile();
 
   gfx::Transform green_content_to_target_transform;
   scoped_ptr<SharedQuadState> green_shared_state =
       CreateTestSharedQuadState(green_content_to_target_transform, viewport);
   green_shared_state->opacity = 0.5f;
 
   scoped_ptr<PictureDrawQuad> green_quad = PictureDrawQuad::Create();
   green_quad->SetNew(green_shared_state.get(),
                      viewport,
                      gfx::Rect(),
                      gfx::RectF(0, 0, 1, 1),
                      viewport.size(),
-                     contents_swizzled,
+                     texture_format,
                      viewport,
                      1.f,
                      use_skia_gpu_backend,
                      green_pile);
   pass->quad_list.push_back(green_quad.PassAs<DrawQuad>());
 
   // One viewport-filling white quad.
   scoped_refptr<FakePicturePileImpl> white_pile =
       FakePicturePileImpl::CreateFilledPile(pile_tile_size, viewport.size());
   SkPaint white_paint;
   white_paint.setColor(SK_ColorWHITE);
   white_pile->add_draw_rect_with_paint(viewport, white_paint);
   white_pile->RerecordPile();
 
   gfx::Transform white_content_to_target_transform;
   scoped_ptr<SharedQuadState> white_shared_state =
       CreateTestSharedQuadState(white_content_to_target_transform, viewport);
 
   scoped_ptr<PictureDrawQuad> white_quad = PictureDrawQuad::Create();
   white_quad->SetNew(white_shared_state.get(),
                      viewport,
                      gfx::Rect(),
                      gfx::RectF(0, 0, 1, 1),
                      viewport.size(),
-                     contents_swizzled,
+                     texture_format,
                      viewport,
                      1.f,
                      use_skia_gpu_backend,
                      white_pile);
   pass->quad_list.push_back(white_quad.PassAs<DrawQuad>());
 
   RenderPassList pass_list;
   pass_list.push_back(pass.Pass());
 
   EXPECT_TRUE(this->RunPixelTest(
       &pass_list,
       PixelTest::NoOffscreenContext,
       base::FilePath(FILE_PATH_LITERAL("green_alpha.png")),
       FuzzyPixelOffByOneComparator(true)));
 }
 
 TYPED_TEST(RendererPixelTestWithSkiaGPUBackend,
            PictureDrawQuadNonIdentityScale) {
   gfx::Size pile_tile_size(1000, 1000);
   gfx::Rect viewport(this->device_viewport_size_);
   bool use_skia_gpu_backend = this->UseSkiaGPUBackend();
   // TODO(enne): the renderer should figure this out on its own.
-  bool contents_swizzled = !PlatformColor::SameComponentOrder(GL_RGBA);
+  ResourceFormat texture_format = RGBA_8888;
 
   RenderPass::Id id(1, 1);
   gfx::Transform transform_to_root;
   scoped_ptr<RenderPass> pass =
       CreateTestRenderPass(id, viewport, transform_to_root);
 
   // As scaling up the blue checkerboards will cause sampling on the GPU,
   // a few extra "cleanup rects" need to be added to clobber the blending
   // to make the output image more clean.  This will also test subrects
   // of the layer.
@@ skipping 13 matching lines @@
 
   scoped_ptr<SharedQuadState> top_right_green_shared_quad_state =
       CreateTestSharedQuadState(green_content_to_target_transform, viewport);
 
   scoped_ptr<PictureDrawQuad> green_quad1 = PictureDrawQuad::Create();
   green_quad1->SetNew(top_right_green_shared_quad_state.get(),
                       green_rect1,
                       gfx::Rect(),
                       gfx::RectF(green_rect1.size()),
                       green_rect1.size(),
-                      contents_swizzled,
+                      texture_format,
                       green_rect1,
                       1.f,
                       use_skia_gpu_backend,
                       green_pile);
   pass->quad_list.push_back(green_quad1.PassAs<DrawQuad>());
 
   scoped_ptr<PictureDrawQuad> green_quad2 = PictureDrawQuad::Create();
   green_quad2->SetNew(top_right_green_shared_quad_state.get(),
                       green_rect2,
                       gfx::Rect(),
                       gfx::RectF(green_rect2.size()),
                       green_rect2.size(),
-                      contents_swizzled,
+                      texture_format,
                       green_rect2,
                       1.f,
                       use_skia_gpu_backend,
                       green_pile);
   pass->quad_list.push_back(green_quad2.PassAs<DrawQuad>());
 
   // Add a green clipped checkerboard in the bottom right to help test
   // interleaving picture quad content and solid color content.
   gfx::Rect bottom_right_rect(
       gfx::Point(viewport.width() / 2, viewport.height() / 2),
@@ skipping 51 matching lines @@
   gfx::Rect quad_content_rect(gfx::Size(20, 20));
   scoped_ptr<SharedQuadState> blue_shared_state =
       CreateTestSharedQuadState(content_to_target_transform, quad_content_rect);
 
   scoped_ptr<PictureDrawQuad> blue_quad = PictureDrawQuad::Create();
   blue_quad->SetNew(blue_shared_state.get(),
                     quad_content_rect,
                     gfx::Rect(),
                     quad_content_rect,
                     content_union_rect.size(),
-                    contents_swizzled,
+                    texture_format,
                     content_union_rect,
                     contents_scale,
                     use_skia_gpu_backend,
                     pile);
   pass->quad_list.push_back(blue_quad.PassAs<DrawQuad>());
 
   // Fill left half of viewport with green.
   gfx::Transform half_green_content_to_target_transform;
   gfx::Rect half_green_rect(gfx::Size(viewport.width() / 2, viewport.height()));
   scoped_ptr<SharedQuadState> half_green_shared_state =
@@ skipping 10 matching lines @@
   EXPECT_TRUE(this->RunPixelTest(
       &pass_list,
       PixelTest::NoOffscreenContext,
       base::FilePath(FILE_PATH_LITERAL("four_blue_green_checkers.png")),
       ExactPixelComparator(true)));
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 }  // namespace cc