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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 1422103003: cc: Remove the ability to specify a GL texture target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Incorporate review feedback Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9f1efdcdadbd9853f533b60d065aee811459e38f..2712f852f04f181973661d6546522534d49d467b 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2120,8 +2120,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
ContextProvider* context_provider = output_surface_->context_provider();
if (!context_provider) {
- *resource_pool = ResourcePool::Create(resource_provider_.get(),
- GetTaskRunner(), GL_TEXTURE_2D);
+ *resource_pool =
+ ResourcePool::Create(resource_provider_.get(), GetTaskRunner());
*tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
GetTaskRunner(), task_graph_runner, resource_provider_.get());
@@ -2131,8 +2131,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
if (use_gpu_rasterization_) {
DCHECK(resource_provider_->output_surface()->worker_context_provider());
- *resource_pool = ResourcePool::Create(resource_provider_.get(),
- GetTaskRunner(), GL_TEXTURE_2D);
+ *resource_pool =
+ ResourcePool::Create(resource_provider_.get(), GetTaskRunner());
int msaa_sample_count = use_msaa_ ? RequestedMSAASampleCount() : 0;
@@ -2155,8 +2155,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
}
if (use_zero_copy) {
- *resource_pool =
- ResourcePool::Create(resource_provider_.get(), GetTaskRunner());
+ *resource_pool = ResourcePool::CreateForImageTextureTarget(
+ resource_provider_.get(), GetTaskRunner());
*tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
GetTaskRunner(), task_graph_runner, resource_provider_.get(),
@@ -2164,8 +2164,8 @@ void LayerTreeHostImpl::CreateResourceAndTileTaskWorkerPool(
return;
}
- *resource_pool = ResourcePool::Create(resource_provider_.get(),
- GetTaskRunner(), GL_TEXTURE_2D);
+ *resource_pool =
+ ResourcePool::Create(resource_provider_.get(), GetTaskRunner());
int max_copy_texture_chromium_size = context_provider->ContextCapabilities()
.gpu.max_copy_texture_chromium_size;
« 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