Index: cc/resources/resource_provider_unittest.cc |
diff --git a/cc/resources/resource_provider_unittest.cc b/cc/resources/resource_provider_unittest.cc |
index 53741ab30a83a0191ef6d0e99fbe41d5f25ed29c..6efb03c4e499a4db8b0228b260e4879ab3290ab2 100644 |
--- a/cc/resources/resource_provider_unittest.cc |
+++ b/cc/resources/resource_provider_unittest.cc |
@@ -97,10 +97,8 @@ class TextureStateTrackingContext : public TestWebGraphicsContext3D { |
MOCK_METHOD3(texParameteri, void(GLenum target, GLenum pname, GLint param)); |
MOCK_METHOD1(waitSyncPoint, void(GLuint sync_point)); |
MOCK_METHOD0(insertSyncPoint, GLuint(void)); |
- MOCK_METHOD2(produceTextureCHROMIUM, |
- void(GLenum target, const GLbyte* mailbox)); |
- MOCK_METHOD2(consumeTextureCHROMIUM, |
- void(GLenum target, const GLbyte* mailbox)); |
+ MOCK_METHOD3(produceTextureDirectCHROMIUM, |
+ void(GLuint texture, GLenum target, const GLbyte* mailbox)); |
// Force all textures to be consecutive numbers starting at "1", |
// so we easily can test for them. |
@@ -258,25 +256,33 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { |
return shared_data_->GenMailbox(mailbox); |
} |
- void produceTextureCHROMIUM(GLenum target, const GLbyte* mailbox) override { |
- CheckTextureIsBound(target); |
- |
+ void produceTextureDirectCHROMIUM(GLuint texture, |
+ GLenum target, |
+ const GLbyte* mailbox) override { |
// Delay moving the texture into the mailbox until the next |
// InsertSyncPoint, so that it is not visible to other contexts that |
// haven't waited on that sync point. |
scoped_ptr<PendingProduceTexture> pending(new PendingProduceTexture); |
memcpy(pending->mailbox, mailbox, sizeof(pending->mailbox)); |
base::AutoLock lock_for_texture_access(namespace_->lock); |
- pending->texture = BoundTexture(target); |
+ pending->texture = UnboundTexture(texture); |
pending_produce_textures_.push_back(pending.Pass()); |
} |
+ GLuint createAndConsumeTextureCHROMIUM(GLenum target, |
+ const GLbyte* mailbox) override { |
+ GLuint texture_id = createTexture(); |
+ base::AutoLock lock_for_texture_access(namespace_->lock); |
+ scoped_refptr<TestTexture> texture = |
+ shared_data_->ConsumeTexture(mailbox, last_waited_sync_point_); |
+ namespace_->textures.Replace(texture_id, texture); |
+ return texture_id; |
+ } |
+ |
void consumeTextureCHROMIUM(GLenum target, const GLbyte* mailbox) override { |
vmiura
2015/02/04 06:29:52
Why do we need to remove the prior code?
i.e.
Ch
sohanjg
2015/02/05 09:50:33
Sorry for being late. no we dont need that.
We won
|
- CheckTextureIsBound(target); |
base::AutoLock lock_for_texture_access(namespace_->lock); |
scoped_refptr<TestTexture> texture = |
shared_data_->ConsumeTexture(mailbox, last_waited_sync_point_); |
- namespace_->textures.Replace(BoundTextureId(target), texture); |
} |
void GetPixels(const gfx::Size& size, |
@@ -290,6 +296,17 @@ class ResourceProviderContext : public TestWebGraphicsContext3D { |
memcpy(pixels, texture->data.get(), TextureSizeBytes(size, format)); |
} |
+ void GetPixelsForTexture(const gfx::Size& size, |
+ ResourceFormat format, |
+ uint8_t* pixels, |
+ unsigned id) { |
+ base::AutoLock lock_for_texture_access(namespace_->lock); |
+ scoped_refptr<TestTexture> texture = BoundTexture(GL_TEXTURE_2D); |
+ ASSERT_EQ(texture->size, size); |
+ ASSERT_EQ(texture->format, format); |
+ memcpy(pixels, texture->data.get(), TextureSizeBytes(size, format)); |
+ } |
+ |
protected: |
explicit ResourceProviderContext(ContextSharedData* shared_data) |
: shared_data_(shared_data), |
@@ -358,7 +375,7 @@ void GetResourcePixels(ResourceProvider* resource_provider, |
ResourceProvider::ScopedReadLockGL lock_gl(resource_provider, id); |
ASSERT_NE(0U, lock_gl.texture_id()); |
context->bindTexture(GL_TEXTURE_2D, lock_gl.texture_id()); |
- context->GetPixels(size, format, pixels); |
+ context->GetPixelsForTexture(size, format, pixels, lock_gl.texture_id()); |
break; |
} |
case ResourceProvider::Bitmap: { |
@@ -461,9 +478,9 @@ class ResourceProviderTest |
if (GetParam() == ResourceProvider::GLTexture) { |
unsigned texture = child_context_->createTexture(); |
gpu::Mailbox gpu_mailbox; |
- child_context_->bindTexture(GL_TEXTURE_2D, texture); |
child_context_->genMailboxCHROMIUM(gpu_mailbox.name); |
- child_context_->produceTextureCHROMIUM(GL_TEXTURE_2D, gpu_mailbox.name); |
+ child_context_->produceTextureDirectCHROMIUM(texture, GL_TEXTURE_2D, |
+ gpu_mailbox.name); |
*sync_point = child_context_->insertSyncPoint(); |
EXPECT_LT(0u, *sync_point); |
@@ -636,12 +653,11 @@ TEST_P(ResourceProviderTest, TransferGLResources) { |
} |
GLuint external_texture_id = child_context_->createExternalTexture(); |
- child_context_->bindTexture(GL_TEXTURE_EXTERNAL_OES, external_texture_id); |
gpu::Mailbox external_mailbox; |
child_context_->genMailboxCHROMIUM(external_mailbox.name); |
- child_context_->produceTextureCHROMIUM(GL_TEXTURE_EXTERNAL_OES, |
- external_mailbox.name); |
+ child_context_->produceTextureDirectCHROMIUM( |
+ external_texture_id, GL_TEXTURE_EXTERNAL_OES, external_mailbox.name); |
const GLuint external_sync_point = child_context_->insertSyncPoint(); |
ResourceProvider::ResourceId id4 = |
child_resource_provider_->CreateResourceFromTextureMailbox( |
@@ -1723,9 +1739,8 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest { |
resource_ids_to_transfer.push_back(id); |
TransferableResourceArray list; |
- EXPECT_CALL(*child_context, bindTexture(GL_TEXTURE_2D, child_texture_id)); |
EXPECT_CALL(*child_context, |
- produceTextureCHROMIUM(GL_TEXTURE_2D, _)); |
+ produceTextureDirectCHROMIUM(_, GL_TEXTURE_2D, _)); |
EXPECT_CALL(*child_context, insertSyncPoint()); |
child_resource_provider->PrepareSendToParent(resource_ids_to_transfer, |
&list); |
@@ -1734,9 +1749,6 @@ class ResourceProviderTestTextureFilters : public ResourceProviderTest { |
ASSERT_EQ(1u, list.size()); |
EXPECT_EQ(static_cast<unsigned>(child_filter), list[0].filter); |
- EXPECT_CALL(*parent_context, |
- bindTexture(GL_TEXTURE_2D, parent_texture_id)); |
- EXPECT_CALL(*parent_context, consumeTextureCHROMIUM(GL_TEXTURE_2D, _)); |
parent_resource_provider->ReceiveFromChild(child_id, list); |
{ |
parent_resource_provider->WaitSyncPointIfNeeded(list[0].id); |
@@ -1820,7 +1832,7 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) { |
GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, &data); |
gpu::Mailbox mailbox; |
context()->genMailboxCHROMIUM(mailbox.name); |
- context()->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
+ context()->produceTextureDirectCHROMIUM(texture, GL_TEXTURE_2D, mailbox.name); |
uint32 sync_point = context()->insertSyncPoint(); |
// All the logic below assumes that the sync points are all positive. |
@@ -1854,14 +1866,15 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) { |
EXPECT_EQ(0u, release_sync_point); |
context()->waitSyncPoint(list[0].mailbox_holder.sync_point); |
- unsigned other_texture = context()->createTexture(); |
- context()->bindTexture(GL_TEXTURE_2D, other_texture); |
- context()->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
+ unsigned other_texture = |
+ context()->createAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
uint8_t test_data[4] = { 0 }; |
context()->GetPixels( |
gfx::Size(1, 1), RGBA_8888, test_data); |
EXPECT_EQ(0, memcmp(data, test_data, sizeof(data))); |
- context()->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
+ |
+ context()->produceTextureDirectCHROMIUM(other_texture, GL_TEXTURE_2D, |
+ mailbox.name); |
context()->deleteTexture(other_texture); |
list[0].mailbox_holder.sync_point = context()->insertSyncPoint(); |
EXPECT_LT(0u, list[0].mailbox_holder.sync_point); |
@@ -1905,14 +1918,15 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) { |
EXPECT_EQ(0u, release_sync_point); |
context()->waitSyncPoint(list[0].mailbox_holder.sync_point); |
- unsigned other_texture = context()->createTexture(); |
- context()->bindTexture(GL_TEXTURE_2D, other_texture); |
- context()->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
+ unsigned other_texture = |
+ context()->createAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
uint8_t test_data[4] = { 0 }; |
context()->GetPixels( |
gfx::Size(1, 1), RGBA_8888, test_data); |
EXPECT_EQ(0, memcmp(data, test_data, sizeof(data))); |
- context()->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
+ |
+ context()->produceTextureDirectCHROMIUM(other_texture, GL_TEXTURE_2D, |
+ mailbox.name); |
context()->deleteTexture(other_texture); |
list[0].mailbox_holder.sync_point = context()->insertSyncPoint(); |
EXPECT_LT(0u, list[0].mailbox_holder.sync_point); |
@@ -1933,8 +1947,8 @@ TEST_P(ResourceProviderTest, TransferMailboxResources) { |
} |
context()->waitSyncPoint(release_sync_point); |
- context()->bindTexture(GL_TEXTURE_2D, texture); |
- context()->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
+ texture = |
+ context()->createAndConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
context()->deleteTexture(texture); |
} |
@@ -2244,7 +2258,7 @@ TEST_P(ResourceProviderTest, LostContext) { |
context()->bindTexture(GL_TEXTURE_2D, texture); |
gpu::Mailbox mailbox; |
context()->genMailboxCHROMIUM(mailbox.name); |
- context()->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name); |
+ context()->produceTextureDirectCHROMIUM(texture, GL_TEXTURE_2D, mailbox.name); |
uint32 sync_point = context()->insertSyncPoint(); |
EXPECT_LT(0u, sync_point); |
@@ -2624,15 +2638,13 @@ class ResourceProviderTestTextureMailboxGLFilters |
false, |
1)); |
- unsigned texture_id = 1; |
uint32 sync_point = 30; |
unsigned target = GL_TEXTURE_2D; |
EXPECT_CALL(*context, bindTexture(_, _)).Times(0); |
EXPECT_CALL(*context, waitSyncPoint(_)).Times(0); |
EXPECT_CALL(*context, insertSyncPoint()).Times(0); |
- EXPECT_CALL(*context, produceTextureCHROMIUM(_, _)).Times(0); |
- EXPECT_CALL(*context, consumeTextureCHROMIUM(_, _)).Times(0); |
+ EXPECT_CALL(*context, produceTextureDirectCHROMIUM(_, _, _)).Times(0); |
gpu::Mailbox gpu_mailbox; |
memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1); |
@@ -2661,12 +2673,8 @@ class ResourceProviderTestTextureMailboxGLFilters |
resource_provider->WaitSyncPointIfNeeded(id); |
Mock::VerifyAndClearExpectations(context); |
- // Using the texture does a consume of the mailbox. |
- EXPECT_CALL(*context, bindTexture(target, texture_id)).Times(2); |
- EXPECT_CALL(*context, consumeTextureCHROMIUM(target, _)); |
- |
EXPECT_CALL(*context, insertSyncPoint()).Times(0); |
- EXPECT_CALL(*context, produceTextureCHROMIUM(_, _)).Times(0); |
+ EXPECT_CALL(*context, produceTextureDirectCHROMIUM(_, _, _)).Times(0); |
// The sampler will reset these if |mailbox_nearest_neighbor| does not |
// match |sampler_filter|. |
@@ -2685,10 +2693,9 @@ class ResourceProviderTestTextureMailboxGLFilters |
// necessary. |
EXPECT_CALL(*context, bindTexture(_, _)).Times(0); |
EXPECT_CALL(*context, insertSyncPoint()); |
- EXPECT_CALL(*context, produceTextureCHROMIUM(_, _)).Times(0); |
+ EXPECT_CALL(*context, produceTextureDirectCHROMIUM(_, _, _)).Times(0); |
EXPECT_CALL(*context, waitSyncPoint(_)).Times(0); |
- EXPECT_CALL(*context, consumeTextureCHROMIUM(_, _)).Times(0); |
} |
resource_provider->DeleteResource(id); |
@@ -2773,15 +2780,13 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) { |
false, |
1)); |
- unsigned texture_id = 1; |
uint32 sync_point = 30; |
unsigned target = GL_TEXTURE_EXTERNAL_OES; |
EXPECT_CALL(*context, bindTexture(_, _)).Times(0); |
EXPECT_CALL(*context, waitSyncPoint(_)).Times(0); |
EXPECT_CALL(*context, insertSyncPoint()).Times(0); |
- EXPECT_CALL(*context, produceTextureCHROMIUM(_, _)).Times(0); |
- EXPECT_CALL(*context, consumeTextureCHROMIUM(_, _)).Times(0); |
+ EXPECT_CALL(*context, produceTextureDirectCHROMIUM(_, _, _)).Times(0); |
gpu::Mailbox gpu_mailbox; |
memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1); |
@@ -2803,12 +2808,8 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) { |
resource_provider->WaitSyncPointIfNeeded(id); |
Mock::VerifyAndClearExpectations(context); |
- // Using the texture does a consume of the mailbox. |
- EXPECT_CALL(*context, bindTexture(target, texture_id)); |
- EXPECT_CALL(*context, consumeTextureCHROMIUM(target, _)); |
- |
EXPECT_CALL(*context, insertSyncPoint()).Times(0); |
- EXPECT_CALL(*context, produceTextureCHROMIUM(_, _)).Times(0); |
+ EXPECT_CALL(*context, produceTextureDirectCHROMIUM(_, _, _)).Times(0); |
ResourceProvider::ScopedReadLockGL lock(resource_provider.get(), id); |
Mock::VerifyAndClearExpectations(context); |
@@ -2817,10 +2818,9 @@ TEST_P(ResourceProviderTest, TextureMailbox_GLTextureExternalOES) { |
// necessary. |
EXPECT_CALL(*context, bindTexture(_, _)).Times(0); |
EXPECT_CALL(*context, insertSyncPoint()); |
- EXPECT_CALL(*context, produceTextureCHROMIUM(_, _)).Times(0); |
+ EXPECT_CALL(*context, produceTextureDirectCHROMIUM(_, _, _)).Times(0); |
EXPECT_CALL(*context, waitSyncPoint(_)).Times(0); |
- EXPECT_CALL(*context, consumeTextureCHROMIUM(_, _)).Times(0); |
} |
} |
@@ -2854,8 +2854,7 @@ TEST_P(ResourceProviderTest, |
EXPECT_CALL(*context, bindTexture(_, _)).Times(0); |
EXPECT_CALL(*context, waitSyncPoint(_)).Times(0); |
EXPECT_CALL(*context, insertSyncPoint()).Times(0); |
- EXPECT_CALL(*context, produceTextureCHROMIUM(_, _)).Times(0); |
- EXPECT_CALL(*context, consumeTextureCHROMIUM(_, _)).Times(0); |
+ EXPECT_CALL(*context, produceTextureDirectCHROMIUM(_, _, _)).Times(0); |
gpu::Mailbox gpu_mailbox; |
memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1); |
@@ -2913,8 +2912,7 @@ TEST_P(ResourceProviderTest, TextureMailbox_WaitSyncPointIfNeeded_NoSyncPoint) { |
EXPECT_CALL(*context, bindTexture(_, _)).Times(0); |
EXPECT_CALL(*context, waitSyncPoint(_)).Times(0); |
EXPECT_CALL(*context, insertSyncPoint()).Times(0); |
- EXPECT_CALL(*context, produceTextureCHROMIUM(_, _)).Times(0); |
- EXPECT_CALL(*context, consumeTextureCHROMIUM(_, _)).Times(0); |
+ EXPECT_CALL(*context, produceTextureDirectCHROMIUM(_, _, _)).Times(0); |
gpu::Mailbox gpu_mailbox; |
memcpy(gpu_mailbox.name, "Hello world", strlen("Hello world") + 1); |