Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(975)

Unified Diff: cc/test/layer_tree_pixel_resource_test.cc

Issue 817133006: Support different formats in the same resource pool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ResourceFormatUsage Created 5 years, 11 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/test/layer_tree_pixel_resource_test.cc
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index e3df017489fa10d60968342c5f474d149859cb5e..dea27053d1e3c94dd91234cae7d004c7eb9c099a 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -167,9 +167,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
EXPECT_FALSE(context_provider);
EXPECT_EQ(PIXEL_TEST_SOFTWARE, test_type_);
*resource_pool =
- ResourcePool::Create(resource_provider,
- draw_texture_target_,
- resource_provider->best_texture_format());
+ ResourcePool::Create(resource_provider, draw_texture_target_, false);
*tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
@@ -179,9 +177,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
EXPECT_TRUE(context_provider);
EXPECT_EQ(PIXEL_TEST_GL, test_type_);
*resource_pool =
- ResourcePool::Create(resource_provider,
- draw_texture_target_,
- resource_provider->best_texture_format());
+ ResourcePool::Create(resource_provider, draw_texture_target_, false);
*tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
task_runner, TileTaskWorkerPool::GetTaskGraphRunner());
@@ -191,9 +187,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
EXPECT_EQ(PIXEL_TEST_GL, test_type_);
EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
*resource_pool =
- ResourcePool::Create(resource_provider,
- draw_texture_target_,
- resource_provider->best_texture_format());
+ ResourcePool::Create(resource_provider, draw_texture_target_, false);
*tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
@@ -204,14 +198,10 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
EXPECT_EQ(PIXEL_TEST_GL, test_type_);
EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
// We need to create a staging resource pool when using copy rasterizer.
- *staging_resource_pool =
- ResourcePool::Create(resource_provider,
- staging_texture_target_,
- resource_provider->best_texture_format());
- *resource_pool =
- ResourcePool::Create(resource_provider,
- draw_texture_target_,
- resource_provider->best_texture_format());
+ *staging_resource_pool = ResourcePool::Create(
+ resource_provider, staging_texture_target_, false);
+ *resource_pool = ResourcePool::Create(
+ resource_provider, draw_texture_target_, false);
*tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
@@ -220,10 +210,8 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
case PIXEL_BUFFER_TILE_TASK_WORKER_POOL:
EXPECT_TRUE(context_provider);
EXPECT_EQ(PIXEL_TEST_GL, test_type_);
- *resource_pool = ResourcePool::Create(
- resource_provider,
- draw_texture_target_,
- resource_provider->memory_efficient_texture_format());
+ *resource_pool =
+ ResourcePool::Create(resource_provider, draw_texture_target_, true);
*tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),

Powered by Google App Engine
This is Rietveld 408576698