summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authorengedy <engedy@chromium.org>2015-12-10 04:41:29 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-10 12:42:34 +0000
commitce048626c1e0d2b9ca9a574bb2d7448d3f77147c (patch)
tree20da25d832f34e0a6a62b2ccb5d84c0d6471bc59 /cc/test
parent5eb722fa5e9e3ac311f46923d0c6f84af5cf316a (diff)
downloadchromium_src-ce048626c1e0d2b9ca9a574bb2d7448d3f77147c.zip
chromium_src-ce048626c1e0d2b9ca9a574bb2d7448d3f77147c.tar.gz
chromium_src-ce048626c1e0d2b9ca9a574bb2d7448d3f77147c.tar.bz2
Revert of Allow one-copy task tile worker pool to use compressed textures. (patchset #14 id:260001 of https://codereview.chromium.org/1379783002/ )
Reason for revert: Resulted in linux-release/sizes/chrome-si/initializers failure: https://build.chromium.org/p/chromium/builders/Mac/builds/9905 https://build.chromium.org/p/chromium/builders/Linux/builds/69200 26a27 > # texture_compressor_etc1_sse.cc _GLOBAL__sub_I_texture_compressor_etc1_sse.cc+0xb 29c30 < # Found 28 static initializers in 8 files. --- > # Found 29 static initializers in 9 files. If this is intended, please update corresponding performance test expectations. Original issue's description: > Allow one-copy and zero-copy task tile worker pools to use compressed textures. > > BUG=434699 > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/7d60ce9a132a88ead407a2a58c91edc431e68259 > Cr-Commit-Position: refs/heads/master@{#364326} TBR=reveman@chromium.org,nyquist@chromium.org,piman@chromium.org,sievers@chromium.org,christiank@opera.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=434699 Review URL: https://codereview.chromium.org/1513733003 Cr-Commit-Position: refs/heads/master@{#364342}
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/layer_tree_pixel_resource_test.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index 5d810ab..347933c 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -147,8 +147,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
*resource_pool = ResourcePool::Create(resource_provider, task_runner);
*tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
- task_runner, task_graph_runner(), resource_provider,
- PlatformColor::BestTextureFormat());
+ task_runner, task_graph_runner(), resource_provider, false);
break;
case ONE_COPY_TILE_TASK_WORKER_POOL:
EXPECT_TRUE(context_provider);
@@ -159,8 +158,7 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
*tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
task_runner, task_graph_runner(), context_provider, resource_provider,
max_bytes_per_copy_operation, false,
- max_staging_buffer_usage_in_bytes,
- PlatformColor::BestTextureFormat());
+ max_staging_buffer_usage_in_bytes, false);
break;
}
}