cc/resources/resource_provider_unittest.cc - Issue 49163004: cc: Reduce command buffer flushes related to creating texture ids.

Unified Diff: cc/resources/resource_provider_unittest.cc

Issue 49163004: cc: Reduce command buffer flushes related to creating texture ids. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add LayerTreeSettings::texture_id_allocation_chunk_size Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/resources/resource_provider_unittest.cc

diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc

index a0b65234e518e764a2a33127c0953cdc817a407f..0d7e7fe3359bac29615ef1123d0abd727fe01deb 100644

--- a/cc/resources/resource_provider_unittest.cc

+++ b/cc/resources/resource_provider_unittest.cc

@@ -5,6 +5,7 @@

#include "cc/resources/resource_provider.h"

#include <algorithm>

+#include <map>

#include "base/bind.h"

#include "base/containers/hash_tables.h"

@@ -98,6 +99,8 @@ class TextureStateTrackingContext : public TestWebGraphicsContext3D {

base::AutoLock lock(namespace_->lock);

return namespace_->next_texture_id++;

}

+ virtual void RetireTextureId(WebKit::WebGLId) OVERRIDE {

+ }

};

// Shared data between multiple ResourceProviderContext. This contains mailbox

@@ -478,9 +481,13 @@ class ResourceProviderTest

shared_bitmap_manager_.reset(new TestSharedBitmapManager());

resource_provider_ = ResourceProvider::Create(

- output_surface_.get(), shared_bitmap_manager_.get(), 0, false);

+ output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1);

child_resource_provider_ = ResourceProvider::Create(

- child_output_surface_.get(), shared_bitmap_manager_.get(), 0, false);

+ child_output_surface_.get(),

+ shared_bitmap_manager_.get(),

+ 0,

+ false,

+ 1);

}

static void CollectResources(ReturnedResourceArray* array,

@@ -1021,7 +1028,11 @@ TEST_P(ResourceProviderTest, TransferSoftwareToNonUber) {

CHECK(parent_output_surface->BindToClient(&parent_output_surface_client));

scoped_ptr<ResourceProvider> parent_resource_provider(

- ResourceProvider::Create(parent_output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(parent_output_surface.get(),

+ NULL,

+ 0,

+ false,

+ 1));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -1075,7 +1086,11 @@ TEST_P(ResourceProviderTest, TransferGLToSoftware) {

CHECK(child_output_surface->BindToClient(&child_output_surface_client));

scoped_ptr<ResourceProvider> child_resource_provider(

- ResourceProvider::Create(child_output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(child_output_surface.get(),

+ NULL,

+ 0,

+ false,

+ 1));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -1423,7 +1438,11 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {

CHECK(child_output_surface->BindToClient(&child_output_surface_client));

scoped_ptr<ResourceProvider> child_resource_provider(

- ResourceProvider::Create(child_output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(child_output_surface.get(),

+ NULL,

+ 0,

+ false,

+ 1));

scoped_ptr<TextureStateTrackingContext> parent_context_owned(

new TextureStateTrackingContext);

@@ -1435,7 +1454,11 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest {

CHECK(parent_output_surface->BindToClient(&parent_output_surface_client));

scoped_ptr<ResourceProvider> parent_resource_provider(

- ResourceProvider::Create(parent_output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(parent_output_surface.get(),

+ NULL,

+ 0,

+ false,

+ 1));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2036,7 +2059,7 @@ TEST_P(ResourceProviderTest, ScopedSampler) {

CHECK(output_surface->BindToClient(&output_surface_client));

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2117,7 +2140,7 @@ TEST_P(ResourceProviderTest, ManagedResource) {

CHECK(output_surface->BindToClient(&output_surface_client));

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2162,7 +2185,7 @@ TEST_P(ResourceProviderTest, TextureWrapMode) {

CHECK(output_surface->BindToClient(&output_surface_client));

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

gfx::Size size(1, 1);

ResourceFormat format = RGBA_8888;

@@ -2215,7 +2238,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_SharedMemory) {

CHECK(output_surface->BindToClient(&output_surface_client));

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

scoped_ptr<SingleReleaseCallback> callback = SingleReleaseCallback::Create(

base::Bind(&EmptyReleaseCallback));

@@ -2250,7 +2273,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTexture2D) {

CHECK(output_surface->BindToClient(&output_surface_client));

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

unsigned texture_id = 1;

unsigned sync_point = 30;

@@ -2314,7 +2337,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) {

CHECK(output_surface->BindToClient(&output_surface_client));

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

unsigned texture_id = 1;

unsigned sync_point = 30;

@@ -2365,8 +2388,8 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) {

class AllocationTrackingContext3D : public TestWebGraphicsContext3D {

public:

- MOCK_METHOD0(createTexture, WebGLId());

- MOCK_METHOD1(deleteTexture, void(WebGLId texture_id));

+ MOCK_METHOD0(NextTextureId, WebGLId());

piman 2013/10/31 01:32:58 Why are we mocking the internals of the TestWebGra

reveman 2013/10/31 13:38:31 I could override genTextures/deleteTextures/delete

+ MOCK_METHOD1(RetireTextureId, void(WebGLId id));

MOCK_METHOD2(bindTexture, void(WGC3Denum target, WebGLId texture));

MOCK_METHOD9(texImage2D,

void(WGC3Denum target,

@@ -2443,7 +2466,7 @@ TEST_P(ResourceProviderTest, TextureAllocation) {

CHECK(output_surface->BindToClient(&output_surface_client));

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

gfx::Size size(2, 2);

gfx::Vector2d offset(0, 0);

@@ -2457,11 +2480,11 @@ TEST_P(ResourceProviderTest, TextureAllocation) {

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

- EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));

+ EXPECT_CALL(*context, NextTextureId()).WillOnce(Return(texture_id));

EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(1);

resource_provider->CreateForTesting(id);

- EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);

+ EXPECT_CALL(*context, RetireTextureId(texture_id)).Times(1);

resource_provider->DeleteResource(id);

Mock::VerifyAndClearExpectations(context);

@@ -2470,13 +2493,13 @@ TEST_P(ResourceProviderTest, TextureAllocation) {

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

- EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));

+ EXPECT_CALL(*context, NextTextureId()).WillOnce(Return(texture_id));

EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(3);

EXPECT_CALL(*context, texImage2D(_, _, _, 2, 2, _, _, _, _)).Times(1);

EXPECT_CALL(*context, texSubImage2D(_, _, _, _, 2, 2, _, _, _)).Times(1);

resource_provider->SetPixels(id, pixels, rect, rect, offset);

- EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);

+ EXPECT_CALL(*context, RetireTextureId(texture_id)).Times(1);

resource_provider->DeleteResource(id);

Mock::VerifyAndClearExpectations(context);

@@ -2486,7 +2509,7 @@ TEST_P(ResourceProviderTest, TextureAllocation) {

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

resource_provider->AcquirePixelBuffer(id);

- EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));

+ EXPECT_CALL(*context, NextTextureId()).WillOnce(Return(texture_id));

EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(2);

EXPECT_CALL(*context, asyncTexImage2DCHROMIUM(_, _, _, 2, 2, _, _, _, _))

.Times(1);

@@ -2495,7 +2518,7 @@ TEST_P(ResourceProviderTest, TextureAllocation) {

resource_provider->ReleasePixelBuffer(id);

- EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);

+ EXPECT_CALL(*context, RetireTextureId(texture_id)).Times(1);

resource_provider->DeleteResource(id);

Mock::VerifyAndClearExpectations(context);

@@ -2519,13 +2542,13 @@ TEST_P(ResourceProviderTest, PixelBuffer_GLTexture) {

int texture_id = 123;

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

resource_provider->AcquirePixelBuffer(id);

- EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));

+ EXPECT_CALL(*context, NextTextureId()).WillOnce(Return(texture_id));

EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(2);

EXPECT_CALL(*context, asyncTexImage2DCHROMIUM(_, _, _, 2, 2, _, _, _, _))

.Times(1);

@@ -2535,7 +2558,7 @@ TEST_P(ResourceProviderTest, PixelBuffer_GLTexture) {

resource_provider->ReleasePixelBuffer(id);

- EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);

+ EXPECT_CALL(*context, RetireTextureId(texture_id)).Times(1);

resource_provider->DeleteResource(id);

Mock::VerifyAndClearExpectations(context);

@@ -2556,7 +2579,7 @@ TEST_P(ResourceProviderTest, PixelBuffer_Bitmap) {

const uint32_t kBadBeef = 0xbadbeef;

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

@@ -2602,13 +2625,13 @@ TEST_P(ResourceProviderTest, ForcingAsyncUploadToComplete) {

int texture_id = 123;

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

resource_provider->AcquirePixelBuffer(id);

- EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));

+ EXPECT_CALL(*context, NextTextureId()).WillOnce(Return(texture_id));

EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(2);

EXPECT_CALL(*context, asyncTexImage2DCHROMIUM(_, _, _, 2, 2, _, _, _, _))

.Times(1);

@@ -2621,7 +2644,7 @@ TEST_P(ResourceProviderTest, ForcingAsyncUploadToComplete) {

resource_provider->ReleasePixelBuffer(id);

- EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);

+ EXPECT_CALL(*context, RetireTextureId(texture_id)).Times(1);

resource_provider->DeleteResource(id);

Mock::VerifyAndClearExpectations(context);

@@ -2643,9 +2666,9 @@ TEST_P(ResourceProviderTest, PixelBufferLostContext) {

int texture_id = 123;

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

- EXPECT_CALL(*context, createTexture()).WillRepeatedly(Return(texture_id));

+ EXPECT_CALL(*context, NextTextureId()).WillRepeatedly(Return(texture_id));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

@@ -2681,7 +2704,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {

const unsigned kImageId = 234u;

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

@@ -2710,7 +2733,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {

.RetiresOnSaturation();

resource_provider->UnmapImage(id);

- EXPECT_CALL(*context, createTexture())

+ EXPECT_CALL(*context, NextTextureId())

.WillOnce(Return(kTextureId))

.RetiresOnSaturation();

// Once in CreateTextureId and once in BindForSampling

@@ -2743,7 +2766,7 @@ TEST_P(ResourceProviderTest, Image_GLTexture) {

EXPECT_CALL(*context, bindTexImage2DCHROMIUM(GL_TEXTURE_2D, kImageId))

.Times(1)

.RetiresOnSaturation();

- EXPECT_CALL(*context, deleteTexture(kTextureId))

+ EXPECT_CALL(*context, RetireTextureId(kTextureId))

.Times(1)

.RetiresOnSaturation();

{

@@ -2773,7 +2796,7 @@ TEST_P(ResourceProviderTest, Image_Bitmap) {

const uint32_t kBadBeef = 0xbadbeef;

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

@@ -2824,7 +2847,7 @@ TEST(ResourceProviderTest, BasicInitializeGLSoftware) {

scoped_ptr<SoftwareOutputDevice>(new SoftwareOutputDevice)));

EXPECT_TRUE(output_surface->BindToClient(&client));

scoped_ptr<ResourceProvider> resource_provider(

- ResourceProvider::Create(output_surface.get(), NULL, 0, false));

+ ResourceProvider::Create(output_surface.get(), NULL, 0, false, 1));

CheckCreateResource(ResourceProvider::Bitmap, resource_provider.get(), NULL);

@@ -2856,18 +2879,22 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1Allocate) {

CHECK(output_surface->BindToClient(&output_surface_client));

gfx::Size size(4, 4);

- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

- output_surface.get(), shared_bitmap_manager_.get(), 0, false));

+ scoped_ptr<ResourceProvider> resource_provider(

+ ResourceProvider::Create(output_surface.get(),

+ shared_bitmap_manager_.get(),

+ 0,

+ false,

+ 1));

int texture_id = 123;

ResourceProvider::ResourceId id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, ETC1);

EXPECT_NE(0u, id);

- EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));

+ EXPECT_CALL(*context, NextTextureId()).WillOnce(Return(texture_id));

EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(2);

resource_provider->AllocateForTesting(id);

- EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);

+ EXPECT_CALL(*context, RetireTextureId(texture_id)).Times(1);

resource_provider->DeleteResource(id);

}

@@ -2886,15 +2913,19 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1SetPixels) {

CHECK(output_surface->BindToClient(&output_surface_client));

gfx::Size size(4, 4);

- scoped_ptr<ResourceProvider> resource_provider(ResourceProvider::Create(

- output_surface.get(), shared_bitmap_manager_.get(), 0, false));

+ scoped_ptr<ResourceProvider> resource_provider(

+ ResourceProvider::Create(output_surface.get(),

+ shared_bitmap_manager_.get(),

+ 0,

+ false,

+ 1));

int texture_id = 123;

uint8_t pixels[8];

ResourceProvider::ResourceId id = resource_provider->CreateResource(

size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, ETC1);

EXPECT_NE(0u, id);

- EXPECT_CALL(*context, createTexture()).WillOnce(Return(texture_id));

+ EXPECT_CALL(*context, NextTextureId()).WillOnce(Return(texture_id));

EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, texture_id)).Times(3);

EXPECT_CALL(*context,

compressedTexImage2D(

@@ -2902,7 +2933,7 @@ TEST_P(ResourceProviderTest, CompressedTextureETC1SetPixels) {

resource_provider->SetPixels(

id, pixels, gfx::Rect(size), gfx::Rect(size), gfx::Vector2d(0, 0));

- EXPECT_CALL(*context, deleteTexture(texture_id)).Times(1);

+ EXPECT_CALL(*context, RetireTextureId(texture_id)).Times(1);

resource_provider->DeleteResource(id);

}

@@ -2911,5 +2942,69 @@ INSTANTIATE_TEST_CASE_P(

ResourceProviderTest,

::testing::Values(ResourceProvider::GLTexture, ResourceProvider::Bitmap));

+class TextureIdAllocationTrackingContext : public TestWebGraphicsContext3D {

+ public:

+ virtual WebKit::WebGLId NextTextureId() OVERRIDE {

+ base::AutoLock lock(namespace_->lock);

+ return namespace_->next_texture_id++;

+ }

+ virtual void RetireTextureId(WebKit::WebGLId) OVERRIDE {

+ }

+ WebKit::WebGLId PeekTextureId() {

+ base::AutoLock lock(namespace_->lock);

+ return namespace_->next_texture_id;

+ }

+};

+TEST(ResourceProviderTest, TextureAllocationChunkSize) {

+ scoped_ptr<TextureIdAllocationTrackingContext> context_owned(

+ new TextureIdAllocationTrackingContext);

+ TextureIdAllocationTrackingContext* context = context_owned.get();

+ 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(1, 1);

+ ResourceFormat format = RGBA_8888;

+ {

+ size_t kTextureAllocationChunkSize = 1;

+ scoped_ptr<ResourceProvider> resource_provider(

+ ResourceProvider::Create(output_surface.get(),

+ NULL,

+ 0,

+ false,

+ kTextureAllocationChunkSize));

+ ResourceProvider::ResourceId id = resource_provider->CreateResource(

+ size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

+ resource_provider->AllocateForTesting(id);

+ Mock::VerifyAndClearExpectations(context);

+ DCHECK_EQ(2u, context->PeekTextureId());

+ resource_provider->DeleteResource(id);

+ }

+ {

+ size_t kTextureAllocationChunkSize = 8;

+ scoped_ptr<ResourceProvider> resource_provider(

+ ResourceProvider::Create(output_surface.get(),

+ NULL,

+ 0,

+ false,

+ kTextureAllocationChunkSize));

+ ResourceProvider::ResourceId id = resource_provider->CreateResource(

+ size, GL_CLAMP_TO_EDGE, ResourceProvider::TextureUsageAny, format);

+ resource_provider->AllocateForTesting(id);

+ Mock::VerifyAndClearExpectations(context);

+ DCHECK_EQ(10u, context->PeekTextureId());

+ resource_provider->DeleteResource(id);

+ }

} // namespace

} // namespace cc

« cc/resources/resource_provider.cc ('K') | « cc/resources/resource_provider.cc ('k') | cc/resources/resource_update_controller_unittest.cc » ('j') | no next file with comments »