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

Side by Side Diff: cc/trees/layer_tree_host_impl.cc

Issue 860813002: Remove the default format from ResourcePool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ResourceFormat from TileManager and call TileTaskRunner::GetResourceFormat() directly instea… 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 unified diff | Download patch
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 1996 matching lines...) Expand 10 before | Expand all | Expand 10 after
2007 scoped_ptr<ResourcePool>* resource_pool, 2007 scoped_ptr<ResourcePool>* resource_pool,
2008 scoped_ptr<ResourcePool>* staging_resource_pool) { 2008 scoped_ptr<ResourcePool>* staging_resource_pool) {
2009 base::SingleThreadTaskRunner* task_runner = 2009 base::SingleThreadTaskRunner* task_runner =
2010 proxy_->HasImplThread() ? proxy_->ImplThreadTaskRunner() 2010 proxy_->HasImplThread() ? proxy_->ImplThreadTaskRunner()
2011 : proxy_->MainThreadTaskRunner(); 2011 : proxy_->MainThreadTaskRunner();
2012 DCHECK(task_runner); 2012 DCHECK(task_runner);
2013 2013
2014 ContextProvider* context_provider = output_surface_->context_provider(); 2014 ContextProvider* context_provider = output_surface_->context_provider();
2015 if (!context_provider) { 2015 if (!context_provider) {
2016 *resource_pool = 2016 *resource_pool =
2017 ResourcePool::Create(resource_provider_.get(), 2017 ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
2018 GL_TEXTURE_2D,
2019 resource_provider_->best_texture_format());
2020 2018
2021 *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create( 2019 *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
2022 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), 2020 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
2023 resource_provider_.get()); 2021 resource_provider_.get());
2024 return; 2022 return;
2025 } 2023 }
2026 2024
2027 if (use_gpu_rasterization_) { 2025 if (use_gpu_rasterization_) {
2028 *resource_pool = 2026 *resource_pool =
2029 ResourcePool::Create(resource_provider_.get(), 2027 ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
2030 GL_TEXTURE_2D,
2031 resource_provider_->best_texture_format());
2032 2028
2033 *tile_task_worker_pool = GpuTileTaskWorkerPool::Create( 2029 *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
2034 task_runner, TileTaskWorkerPool::GetTaskGraphRunner()); 2030 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
2031 resource_provider_.get());
2035 return; 2032 return;
2036 } 2033 }
2037 2034
2038 if (GetRendererCapabilities().using_image) { 2035 if (GetRendererCapabilities().using_image) {
2039 unsigned image_target = settings_.use_image_texture_target; 2036 unsigned image_target = settings_.use_image_texture_target;
2040 DCHECK_IMPLIES( 2037 DCHECK_IMPLIES(
2041 image_target == GL_TEXTURE_RECTANGLE_ARB, 2038 image_target == GL_TEXTURE_RECTANGLE_ARB,
2042 context_provider->ContextCapabilities().gpu.texture_rectangle); 2039 context_provider->ContextCapabilities().gpu.texture_rectangle);
2043 DCHECK_IMPLIES( 2040 DCHECK_IMPLIES(
2044 image_target == GL_TEXTURE_EXTERNAL_OES, 2041 image_target == GL_TEXTURE_EXTERNAL_OES,
2045 context_provider->ContextCapabilities().gpu.egl_image_external); 2042 context_provider->ContextCapabilities().gpu.egl_image_external);
2046 2043
2047 if (settings_.use_zero_copy || IsSynchronousSingleThreaded()) { 2044 if (settings_.use_zero_copy || IsSynchronousSingleThreaded()) {
2048 *resource_pool = 2045 *resource_pool =
2049 ResourcePool::Create(resource_provider_.get(), image_target, 2046 ResourcePool::Create(resource_provider_.get(), image_target);
2050 resource_provider_->best_texture_format());
2051 2047
2052 TaskGraphRunner* task_graph_runner; 2048 TaskGraphRunner* task_graph_runner;
2053 if (IsSynchronousSingleThreaded()) { 2049 if (IsSynchronousSingleThreaded()) {
2054 DCHECK(!single_thread_synchronous_task_graph_runner_); 2050 DCHECK(!single_thread_synchronous_task_graph_runner_);
2055 single_thread_synchronous_task_graph_runner_.reset(new TaskGraphRunner); 2051 single_thread_synchronous_task_graph_runner_.reset(new TaskGraphRunner);
2056 task_graph_runner = single_thread_synchronous_task_graph_runner_.get(); 2052 task_graph_runner = single_thread_synchronous_task_graph_runner_.get();
2057 } else { 2053 } else {
2058 task_graph_runner = TileTaskWorkerPool::GetTaskGraphRunner(); 2054 task_graph_runner = TileTaskWorkerPool::GetTaskGraphRunner();
2059 } 2055 }
2060 2056
2061 *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create( 2057 *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
2062 task_runner, task_graph_runner, resource_provider_.get()); 2058 task_runner, task_graph_runner, resource_provider_.get());
2063 return; 2059 return;
2064 } 2060 }
2065 2061
2066 if (settings_.use_one_copy) { 2062 if (settings_.use_one_copy) {
2067 // We need to create a staging resource pool when using copy rasterizer. 2063 // We need to create a staging resource pool when using copy rasterizer.
2068 *staging_resource_pool = 2064 *staging_resource_pool =
2069 ResourcePool::Create(resource_provider_.get(), image_target, 2065 ResourcePool::Create(resource_provider_.get(), image_target);
2070 resource_provider_->best_texture_format());
2071 *resource_pool = 2066 *resource_pool =
2072 ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D, 2067 ResourcePool::Create(resource_provider_.get(), GL_TEXTURE_2D);
2073 resource_provider_->best_texture_format());
2074 2068
2075 *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create( 2069 *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
2076 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), 2070 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(),
2077 context_provider, resource_provider_.get(), 2071 context_provider, resource_provider_.get(),
2078 staging_resource_pool_.get()); 2072 staging_resource_pool_.get());
2079 return; 2073 return;
2080 } 2074 }
2081 } 2075 }
2082 2076
2083 *resource_pool = ResourcePool::Create( 2077 *resource_pool = ResourcePool::Create(
2084 resource_provider_.get(), GL_TEXTURE_2D, 2078 resource_provider_.get(), GL_TEXTURE_2D);
2085 resource_provider_->memory_efficient_texture_format());
2086 2079
2087 *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create( 2080 *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
2088 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), context_provider, 2081 task_runner, TileTaskWorkerPool::GetTaskGraphRunner(), context_provider,
2089 resource_provider_.get(), 2082 resource_provider_.get(),
2090 GetMaxTransferBufferUsageBytes(context_provider->ContextCapabilities(), 2083 GetMaxTransferBufferUsageBytes(context_provider->ContextCapabilities(),
2091 settings_.renderer_settings.refresh_rate)); 2084 settings_.renderer_settings.refresh_rate));
2092 } 2085 }
2093 2086
2094 void LayerTreeHostImpl::DestroyTileManager() { 2087 void LayerTreeHostImpl::DestroyTileManager() {
2095 tile_manager_ = nullptr; 2088 tile_manager_ = nullptr;
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after
3508 } 3501 }
3509 3502
3510 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { 3503 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) {
3511 std::vector<PictureLayerImpl*>::iterator it = 3504 std::vector<PictureLayerImpl*>::iterator it =
3512 std::find(picture_layers_.begin(), picture_layers_.end(), layer); 3505 std::find(picture_layers_.begin(), picture_layers_.end(), layer);
3513 DCHECK(it != picture_layers_.end()); 3506 DCHECK(it != picture_layers_.end());
3514 picture_layers_.erase(it); 3507 picture_layers_.erase(it);
3515 } 3508 }
3516 3509
3517 } // namespace cc 3510 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698