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..6f4204f016878af300dc8a06b92c55fe8cd012ac 100644 |
--- a/cc/trees/layer_tree_host_impl.cc |
+++ b/cc/trees/layer_tree_host_impl.cc |
@@ -1973,8 +1973,9 @@ void LayerTreeHostImpl::CreateAndSetTileManager() { |
DCHECK(resource_provider_); |
rasterizer_ = CreateRasterizer(); |
- CreateResourceAndTileTaskWorkerPool(&tile_task_worker_pool_, &resource_pool_, |
- &staging_resource_pool_); |
+ ResourceFormat resource_format = |
+ CreateResourceAndTileTaskWorkerPool( |
+ &tile_task_worker_pool_, &resource_pool_, &staging_resource_pool_); |
DCHECK(tile_task_worker_pool_); |
DCHECK(resource_pool_); |
@@ -1987,6 +1988,7 @@ void LayerTreeHostImpl::CreateAndSetTileManager() { |
: settings_.scheduled_raster_task_limit; |
tile_manager_ = |
TileManager::Create(this, task_runner, resource_pool_.get(), |
+ resource_format, |
tile_task_worker_pool_->AsTileTaskRunner(), |
rasterizer_.get(), scheduled_raster_task_limit); |
@@ -2002,7 +2004,7 @@ scoped_ptr<Rasterizer> LayerTreeHostImpl::CreateRasterizer() { |
return SoftwareRasterizer::Create(); |
} |
-void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool( |
+ResourceFormat LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool( |
scoped_ptr<TileTaskWorkerPool>* tile_task_worker_pool, |
scoped_ptr<ResourcePool>* resource_pool, |
scoped_ptr<ResourcePool>* staging_resource_pool) { |
@@ -2011,28 +2013,26 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool( |
: proxy_->MainThreadTaskRunner(); |
DCHECK(task_runner); |
+ ResourceFormat resource_format = resource_provider_->best_texture_format(); |
+ |
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(), |
resource_provider_.get()); |
- return; |
+ return resource_format; |
} |
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()); |
- return; |
+ return resource_format; |
} |
if (GetRendererCapabilities().using_image) { |
@@ -2046,8 +2046,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()) { |
@@ -2060,35 +2059,34 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool( |
*tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create( |
task_runner, task_graph_runner, resource_provider_.get()); |
- return; |
+ return resource_format; |
} |
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(), |
context_provider, resource_provider_.get(), |
- staging_resource_pool_.get()); |
- return; |
+ staging_resource_pool_.get(), resource_format); |
+ return resource_format; |
} |
} |
*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, |
resource_provider_.get(), |
GetMaxTransferBufferUsageBytes(context_provider->ContextCapabilities(), |
settings_.renderer_settings.refresh_rate)); |
+ |
+ return resource_provider_->memory_efficient_texture_format(); |
} |
void LayerTreeHostImpl::DestroyTileManager() { |