Index: cc/test/render_pass_test_common.cc |
diff --git a/cc/test/render_pass_test_common.cc b/cc/test/render_pass_test_common.cc |
index f44558f5d5676f6b542335504862ab2d9c29e9ab..beb3f16b28d3436838ef227b01d8ecd3e037969b 100644 |
--- a/cc/test/render_pass_test_common.cc |
+++ b/cc/test/render_pass_test_common.cc |
@@ -29,6 +29,9 @@ void TestRenderPass::AppendOneOfEveryQuadType( |
gfx::Size(20, 12), |
resourceProvider->bestTextureFormat(), |
ResourceProvider::TextureUsageAny); |
+ unsigned texture_id = ResourceProvider::ScopedReadLockGL( |
+ resourceProvider, texture_resource).textureId(); |
+ |
scoped_ptr<cc::SharedQuadState> shared_state = cc::SharedQuadState::Create(); |
shared_state->SetAll(gfx::Transform(), |
rect, |
@@ -58,7 +61,7 @@ void TestRenderPass::AppendOneOfEveryQuadType( |
rect, |
opaque_rect, |
gfx::Size(50, 50), |
- 1, |
+ texture_id, |
cc::IOSurfaceDrawQuad::FLIPPED); |
AppendQuad(io_surface_quad.PassAs<DrawQuad>()); |
@@ -85,7 +88,7 @@ void TestRenderPass::AppendOneOfEveryQuadType( |
stream_video_quad->SetNew(shared_state.get(), |
rect, |
opaque_rect, |
- 1, |
+ texture_id, |
gfx::Transform()); |
AppendQuad(stream_video_quad.PassAs<DrawQuad>()); |
@@ -153,7 +156,10 @@ void TestRenderPass::AppendOneOfEveryQuadType( |
cc::VideoLayerImpl::FramePlane planes[3]; |
for (int i = 0; i < 3; ++i) { |
planes[i].resourceId = |
- resourceProvider->createResourceFromExternalTexture(1); |
+ resourceProvider->createResource( |
+ gfx::Size(20, 12), |
+ resourceProvider->bestTextureFormat(), |
+ ResourceProvider::TextureUsageAny); |
planes[i].size = gfx::Size(100, 100); |
planes[i].format = GL_LUMINANCE; |
} |