cc: Adding ETC1 support to UIResourceBitmap and ResourceProvider

cc/resources/resource_provider_unittest.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 "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/scoped_ptr_deque.h"
 #include "cc/debug/test_texture.h"
 #include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/output_surface.h"
+#include "cc/resources/resource.h"

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

do you need this include? Please remove it if IWYU presubmit check doesn't
complain about it.

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

Please remove this include if IWYU presubmit check doesn't complain about it

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

Done.

 #include "cc/resources/returned_resource.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
@@ skipping 2090 matching lines @@
   MOCK_METHOD9(asyncTexSubImage2DCHROMIUM,
                void(WGC3Denum target,
                     WGC3Dint level,
                     WGC3Dint xoffset,
                     WGC3Dint yoffset,
                     WGC3Dsizei width,
                     WGC3Dsizei height,
                     WGC3Denum format,
                     WGC3Denum type,
                     const void* pixels));
+  MOCK_METHOD8(compressedTexImage2D,
+               void(WGC3Denum target,
+                    WGC3Dint level,
+                    WGC3Denum internalformat,
+                    WGC3Dsizei width,
+                    WGC3Dsizei height,
+                    WGC3Dint border,
+                    WGC3Dsizei imageSize,

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

nit: s/imageSize/image_size/ also fix the other mock below

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

Done.

+                    const void* data));
+  MOCK_METHOD9(compressedTexSubImage2D,
+               void(WGC3Denum target,
+                    WGC3Dint level,
+                    WGC3Dint xoffset,
+                    WGC3Dint yoffset,
+                    WGC3Dsizei width,
+                    WGC3Dsizei height,
+                    WGC3Denum format,
+                    WGC3Dsizei imageSize,
+                    const void* data));
   MOCK_METHOD1(waitAsyncTexImage2DCHROMIUM, void(WGC3Denum));
   MOCK_METHOD3(createImageCHROMIUM, WGC3Duint(WGC3Dsizei, WGC3Dsizei,
                                               WGC3Denum));
   MOCK_METHOD1(destroyImageCHROMIUM, void(WGC3Duint));
   MOCK_METHOD2(mapImageCHROMIUM, void*(WGC3Duint, WGC3Denum));
   MOCK_METHOD3(getImageParameterivCHROMIUM, void(WGC3Duint, WGC3Denum,
                                                  GLint*));
   MOCK_METHOD1(unmapImageCHROMIUM, void(WGC3Duint));
   MOCK_METHOD2(bindTexImage2DCHROMIUM, void(WGC3Denum, WGC3Dint));
   MOCK_METHOD2(releaseTexImage2DCHROMIUM, void(WGC3Denum, WGC3Dint));
@@ skipping 404 matching lines @@
 
   resource_provider->InitializeSoftware();
   output_surface->ReleaseGL();
   CheckCreateResource(ResourceProvider::Bitmap, resource_provider.get(), NULL);
 
   InitializeGLAndCheck(shared_data.get(),
                        resource_provider.get(),
                        output_surface.get());
 }
 
+TEST_P(ResourceProviderTest, CompressedTextureETC1) {
+  if (GetParam() != ResourceProvider::GLTexture)
+    return;
+
+  scoped_ptr<AllocationTrackingContext3D> context_owned(
+      new AllocationTrackingContext3D);
+  AllocationTrackingContext3D* context = context_owned.get();
+  context_owned->set_support_compressed_texture_etc1(true);
+
+  FakeOutputSurfaceClient output_surface_client;
+  scoped_ptr<OutputSurface> output_surface(FakeOutputSurface::Create3d(
+      context_owned.PassAs<TestWebGraphicsContext3D>()));
+  CHECK(output_surface->BindToClient(&output_surface_client));
+
+  gfx::Size size(4, 4);
+  ResourceFormat format = ETC1;

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

consider hardcoding ETC1 while calling ResourceProvider::CreateResource

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

Done.

+  ResourceProvider::ResourceId id = 0;
+
+  scoped_ptr<ResourceProvider> resource_provider(
+      ResourceProvider::Create(output_surface.get(), 0, false));
+  int texture_id = 123;
+
+  id = resource_provider->CreateResource(

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

you can define id here

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

Done.

+      size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
+  EXPECT_NE(0u, id);
+  EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));
+  EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(2);
+  EXPECT_CALL(*context, compressedTexImage2D(_, _, _, _, _, _, _, _)).Times(1);
+  resource_provider->AllocateForTesting(id);
+
+  EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);
+  resource_provider->DeleteResource(id);
+  Mock::VerifyAndClearExpectations(context);
+
+  uint8_t pixels[8];
+
+  id = resource_provider->CreateResource(

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

consider moving this part into its own test case

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

Done.

+      size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);
+  EXPECT_NE(0u, id);
+  EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));
+  EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(3);
+  EXPECT_CALL(*context,
+              compressedTexImage2D(
+                  _, 0, _, size.width(), size.height(), _, _, _)).Times(1);
+  EXPECT_CALL(*context,
+              compressedTexSubImage2D(
+                  _, 0, 0, 0, size.width(), size.height(), _, 8, _)).Times(1);
+  resource_provider->SetPixels(
+      id, pixels, gfx::Rect(size), gfx::Rect(size), gfx::Vector2d(0, 0));
+
+  EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);
+  resource_provider->DeleteResource(id);
+  Mock::VerifyAndClearExpectations(context);
+}
+
 INSTANTIATE_TEST_CASE_P(
     ResourceProviderTests,
     ResourceProviderTest,
     ::testing::Values(ResourceProvider::GLTexture, ResourceProvider::Bitmap));
 
 }  // namespace
 }  // namespace cc