| 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 dd485ba6b759e709edb3ac1f02311cbdbf6012a8..2d494b32807fd977e231771877673a3dfb6e47a6 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -1965,6 +1965,7 @@ void LayerTreeHostImpl::CreateAndSetTileManager() {
|
| tile_manager_ = TileManager::Create(
|
| this, task_runner, resource_pool_.get(),
|
| tile_task_worker_pool_->AsTileTaskRunner(),
|
| + settings_.renderer_settings.tile_compression_threshold,
|
| rendering_stats_instrumentation_, scheduled_raster_task_limit);
|
|
|
| UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
|
| @@ -1982,9 +1983,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, false);
|
|
|
| *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| @@ -1994,9 +1993,7 @@ 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, false);
|
|
|
| *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
|
| task_runner, context_provider, resource_provider_.get(),
|
| @@ -2015,8 +2012,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, false);
|
|
|
| TaskGraphRunner* task_graph_runner;
|
| if (IsSynchronousSingleThreaded()) {
|
| @@ -2035,11 +2031,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, true);
|
| *resource_pool =
|
| - ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D,
|
| - resource_provider_->best_texture_format());
|
| + ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D, true);
|
|
|
| *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
|
| @@ -2049,9 +2043,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
|
| }
|
| }
|
|
|
| - *resource_pool = ResourcePool::Create(
|
| - resource_provider_.get(), GL_TEXTURE_2D,
|
| - resource_provider_->memory_efficient_texture_format());
|
| + *resource_pool =
|
| + ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D, true);
|
|
|
| *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
|
| task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), context_provider,
|
| @@ -2106,8 +2099,12 @@ bool LayerTreeHostImpl::InitializeRenderer(
|
| proxy_->blocking_main_thread_task_runner(),
|
| settings_.renderer_settings.highp_threshold_min,
|
| settings_.renderer_settings.use_rgba_4444_textures,
|
| + settings_.renderer_settings.enable_tile_compression,
|
| settings_.renderer_settings.texture_id_allocation_chunk_size);
|
|
|
| + resource_provider_->set_preferred_tile_compression_method(
|
| + settings_.renderer_settings.tile_compression_method);
|
| +
|
| if (output_surface_->capabilities().deferred_gl_initialization)
|
| EnforceZeroBudget(true);
|
|
|
|
|