| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index db9b072c0d74209d9295fa75fc8622c1ac3983e3..4df75ba4fbaf5a1cbe4a8ca83ac55808e7ff6459 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -1987,6 +1987,7 @@ void LayerTreeHostImpl::CreateAndSetTileManager() {
|
| : settings_.scheduled_raster_task_limit;
|
| tile_manager_ =
|
| TileManager::Create(this, task_runner, resource_pool_.get(),
|
| + tile_task_worker_pool_->GetResourceFormat(),
|
| tile_task_worker_pool_->AsTileTaskRunner(),
|
| rasterizer_.get(), scheduled_raster_task_limit);
|
|
|
| @@ -2014,9 +2015,7 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| ContextProvider* context_provider = output_surface_->context_provider();
|
| if (!context_provider) {
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider_.get(),
|
| - GL_TEXTURE_2D,
|
| - resource_provider_->best_texture_format());
|
| + ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| @@ -2026,12 +2025,11 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
|
|
| if (use_gpu_rasterization_) {
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider_.get(),
|
| - GL_TEXTURE_2D,
|
| - resource_provider_->best_texture_format());
|
| + ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
|
| - task_runner, TileTaskWorkerPool::GetTaskGraphRunner());
|
| + task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| + resource_provider_->best_texture_format());
|
| return;
|
| }
|
|
|
| @@ -2046,8 +2044,7 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
|
|
| if (settings_.use_zero_copy || IsSynchronousSingleThreaded()) {
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider_.get(), image_target,
|
| - resource_provider_->best_texture_format());
|
| + ResourcePool::Create(resource_provider_.get(), image_target);
|
|
|
| TaskGraphRunner* task_graph_runner;
|
| if (IsSynchronousSingleThreaded()) {
|
| @@ -2066,11 +2063,9 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| if (settings_.use_one_copy) {
|
| // We need to create a staging resource pool when using copy rasterizer.
|
| *staging_resource_pool =
|
| - ResourcePool::Create(resource_provider_.get(), image_target,
|
| - resource_provider_->best_texture_format());
|
| + ResourcePool::Create(resource_provider_.get(), image_target);
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D,
|
| - resource_provider_->best_texture_format());
|
| + ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| @@ -2081,8 +2076,7 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| }
|
|
|
| *resource_pool = ResourcePool::Create(
|
| - resource_provider_.get(), GL_TEXTURE_2D,
|
| - resource_provider_->memory_efficient_texture_format());
|
| + resource_provider_.get(), GL_TEXTURE_2D);
|
|
|
| *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), context_provider,
|
|
|