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

Side by Side Diff: cc/test/layer_tree_pixel_resource_test.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, 1 month 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/fake_picture_layer_tiling_client.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/test/layer_tree_pixel_resource_test.h" 5 #include "cc/test/layer_tree_pixel_resource_test.h"
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/raster/bitmap_tile_task_worker_pool.h" 8 #include "cc/raster/bitmap_tile_task_worker_pool.h"
9 #include "cc/raster/gpu_rasterizer.h" 9 #include "cc/raster/gpu_rasterizer.h"
10 #include "cc/raster/gpu_tile_task_worker_pool.h" 10 #include "cc/raster/gpu_tile_task_worker_pool.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ContextProvider* context_provider = 118 ContextProvider* context_provider =
119 host_impl->output_surface()->context_provider(); 119 host_impl->output_surface()->context_provider();
120 ResourceProvider* resource_provider = host_impl->resource_provider(); 120 ResourceProvider* resource_provider = host_impl->resource_provider();
121 int max_bytes_per_copy_operation = 1024 * 1024; 121 int max_bytes_per_copy_operation = 1024 * 1024;
122 int max_staging_buffer_usage_in_bytes = 32 * 1024 * 1024; 122 int max_staging_buffer_usage_in_bytes = 32 * 1024 * 1024;
123 123
124 switch (resource_pool_option_) { 124 switch (resource_pool_option_) {
125 case BITMAP_TILE_TASK_WORKER_POOL: 125 case BITMAP_TILE_TASK_WORKER_POOL:
126 EXPECT_FALSE(context_provider); 126 EXPECT_FALSE(context_provider);
127 EXPECT_EQ(PIXEL_TEST_SOFTWARE, test_type_); 127 EXPECT_EQ(PIXEL_TEST_SOFTWARE, test_type_);
128 *resource_pool = ResourcePool::Create(resource_provider, task_runner, 128 *resource_pool = ResourcePool::CreateForImageTextureTarget(
129 draw_texture_target_); 129 resource_provider, task_runner);
130 130
131 *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create( 131 *tile_task_worker_pool = BitmapTileTaskWorkerPool::Create(
132 task_runner, task_graph_runner(), resource_provider); 132 task_runner, task_graph_runner(), resource_provider);
133 break; 133 break;
134 case GPU_TILE_TASK_WORKER_POOL: 134 case GPU_TILE_TASK_WORKER_POOL:
135 EXPECT_TRUE(context_provider); 135 EXPECT_TRUE(context_provider);
136 EXPECT_EQ(PIXEL_TEST_GL, test_type_); 136 EXPECT_EQ(PIXEL_TEST_GL, test_type_);
137 *resource_pool = ResourcePool::Create(resource_provider, task_runner, 137 *resource_pool = ResourcePool::CreateForImageTextureTarget(
138 draw_texture_target_); 138 resource_provider, task_runner);
139 139
140 *tile_task_worker_pool = GpuTileTaskWorkerPool::Create( 140 *tile_task_worker_pool = GpuTileTaskWorkerPool::Create(
141 task_runner, task_graph_runner(), context_provider, resource_provider, 141 task_runner, task_graph_runner(), context_provider, resource_provider,
142 false, 0); 142 false, 0);
143 break; 143 break;
144 case ZERO_COPY_TILE_TASK_WORKER_POOL: 144 case ZERO_COPY_TILE_TASK_WORKER_POOL:
145 EXPECT_TRUE(context_provider); 145 EXPECT_TRUE(context_provider);
146 EXPECT_EQ(PIXEL_TEST_GL, test_type_); 146 EXPECT_EQ(PIXEL_TEST_GL, test_type_);
147 EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image); 147 EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
148 *resource_pool = ResourcePool::Create(resource_provider, task_runner, 148 *resource_pool = ResourcePool::CreateForImageTextureTarget(
149 draw_texture_target_); 149 resource_provider, task_runner);
150 150
151 *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create( 151 *tile_task_worker_pool = ZeroCopyTileTaskWorkerPool::Create(
152 task_runner, task_graph_runner(), resource_provider, false); 152 task_runner, task_graph_runner(), resource_provider, false);
153 break; 153 break;
154 case ONE_COPY_TILE_TASK_WORKER_POOL: 154 case ONE_COPY_TILE_TASK_WORKER_POOL:
155 EXPECT_TRUE(context_provider); 155 EXPECT_TRUE(context_provider);
156 EXPECT_EQ(PIXEL_TEST_GL, test_type_); 156 EXPECT_EQ(PIXEL_TEST_GL, test_type_);
157 EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image); 157 EXPECT_TRUE(host_impl->GetRendererCapabilities().using_image);
158 *resource_pool = ResourcePool::Create(resource_provider, task_runner, 158 *resource_pool = ResourcePool::CreateForImageTextureTarget(
159 draw_texture_target_); 159 resource_provider, task_runner);
160 160
161 *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create( 161 *tile_task_worker_pool = OneCopyTileTaskWorkerPool::Create(
162 task_runner, task_graph_runner(), context_provider, resource_provider, 162 task_runner, task_graph_runner(), context_provider, resource_provider,
163 max_bytes_per_copy_operation, false, 163 max_bytes_per_copy_operation, false,
164 max_staging_buffer_usage_in_bytes, false); 164 max_staging_buffer_usage_in_bytes, false);
165 break; 165 break;
166 } 166 }
167 } 167 }
168 168
169 void LayerTreeHostPixelResourceTest::RunPixelResourceTest( 169 void LayerTreeHostPixelResourceTest::RunPixelResourceTest(
170 scoped_refptr<Layer> content_root, 170 scoped_refptr<Layer> content_root,
171 base::FilePath file_name) { 171 base::FilePath file_name) {
172 if (!IsTestCaseSupported(test_case_)) 172 if (!IsTestCaseSupported(test_case_))
173 return; 173 return;
174 RunPixelTest(test_type_, content_root, file_name); 174 RunPixelTest(test_type_, content_root, file_name);
175 } 175 }
176 176
177 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest() 177 ParameterizedPixelResourceTest::ParameterizedPixelResourceTest()
178 : LayerTreeHostPixelResourceTest(GetParam()) { 178 : LayerTreeHostPixelResourceTest(GetParam()) {
179 } 179 }
180 180
181 } // namespace cc 181 } // namespace cc
OLDNEW
« no previous file with comments | « cc/test/fake_picture_layer_tiling_client.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698