OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/resources/tile_task_worker_pool.h" | 5 #include "cc/resources/tile_task_worker_pool.h" |
6 | 6 |
7 #include "base/test/test_simple_task_runner.h" | 7 #include "base/test/test_simple_task_runner.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "cc/debug/lap_timer.h" | 9 #include "cc/debug/lap_timer.h" |
10 #include "cc/output/context_provider.h" | 10 #include "cc/output/context_provider.h" |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 break; | 239 break; |
240 case TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY: | 240 case TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY: |
241 Create3dOutputSurfaceAndResourceProvider(); | 241 Create3dOutputSurfaceAndResourceProvider(); |
242 tile_task_worker_pool_ = ZeroCopyTileTaskWorkerPool::Create( | 242 tile_task_worker_pool_ = ZeroCopyTileTaskWorkerPool::Create( |
243 task_runner_.get(), task_graph_runner_.get(), | 243 task_runner_.get(), task_graph_runner_.get(), |
244 resource_provider_.get()); | 244 resource_provider_.get()); |
245 break; | 245 break; |
246 case TILE_TASK_WORKER_POOL_TYPE_ONE_COPY: | 246 case TILE_TASK_WORKER_POOL_TYPE_ONE_COPY: |
247 Create3dOutputSurfaceAndResourceProvider(); | 247 Create3dOutputSurfaceAndResourceProvider(); |
248 staging_resource_pool_ = ResourcePool::Create(resource_provider_.get(), | 248 staging_resource_pool_ = ResourcePool::Create(resource_provider_.get(), |
249 GL_TEXTURE_2D, RGBA_8888); | 249 resource_provider_.get(), |
| 250 GL_TEXTURE_2D, false); |
250 tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create( | 251 tile_task_worker_pool_ = OneCopyTileTaskWorkerPool::Create( |
251 task_runner_.get(), task_graph_runner_.get(), | 252 task_runner_.get(), task_graph_runner_.get(), |
252 context_provider_.get(), resource_provider_.get(), | 253 context_provider_.get(), resource_provider_.get(), |
253 staging_resource_pool_.get()); | 254 staging_resource_pool_.get()); |
254 break; | 255 break; |
255 case TILE_TASK_WORKER_POOL_TYPE_GPU: | 256 case TILE_TASK_WORKER_POOL_TYPE_GPU: |
256 Create3dOutputSurfaceAndResourceProvider(); | 257 Create3dOutputSurfaceAndResourceProvider(); |
257 tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create( | 258 tile_task_worker_pool_ = GpuTileTaskWorkerPool::Create( |
258 task_runner_.get(), context_provider_.get(), | 259 task_runner_.get(), context_provider_.get(), |
259 resource_provider_.get(), false); | 260 resource_provider_.get(), false); |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 test_name, timer_.LapsPerSecond(), "runs/s", true); | 378 test_name, timer_.LapsPerSecond(), "runs/s", true); |
378 } | 379 } |
379 | 380 |
380 private: | 381 private: |
381 void Create3dOutputSurfaceAndResourceProvider() { | 382 void Create3dOutputSurfaceAndResourceProvider() { |
382 output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass(); | 383 output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass(); |
383 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 384 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
384 resource_provider_ = ResourceProvider::Create(output_surface_.get(), NULL, | 385 resource_provider_ = ResourceProvider::Create(output_surface_.get(), NULL, |
385 &gpu_memory_buffer_manager_, | 386 &gpu_memory_buffer_manager_, |
386 NULL, 0, false, 1).Pass(); | 387 NULL, 0, false, 1).Pass(); |
| 388 false, |
387 } | 389 } |
388 | 390 |
389 void CreateSoftwareOutputSurfaceAndResourceProvider() { | 391 void CreateSoftwareOutputSurfaceAndResourceProvider() { |
390 output_surface_ = FakeOutputSurface::CreateSoftware( | 392 output_surface_ = FakeOutputSurface::CreateSoftware( |
391 make_scoped_ptr(new SoftwareOutputDevice)); | 393 make_scoped_ptr(new SoftwareOutputDevice)); |
392 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 394 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
393 resource_provider_ = | 395 resource_provider_ = |
394 ResourceProvider::Create(output_surface_.get(), &shared_bitmap_manager_, | 396 ResourceProvider::Create(output_surface_.get(), &shared_bitmap_manager_, |
395 NULL, NULL, 0, false, 1).Pass(); | 397 NULL, NULL, 0, false, 1).Pass(); |
| 398 false, |
396 } | 399 } |
397 | 400 |
398 std::string TestModifierString() const { | 401 std::string TestModifierString() const { |
399 switch (GetParam()) { | 402 switch (GetParam()) { |
400 case TILE_TASK_WORKER_POOL_TYPE_PIXEL_BUFFER: | 403 case TILE_TASK_WORKER_POOL_TYPE_PIXEL_BUFFER: |
401 return std::string("_pixel_tile_task_worker_pool"); | 404 return std::string("_pixel_tile_task_worker_pool"); |
402 case TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY: | 405 case TILE_TASK_WORKER_POOL_TYPE_ZERO_COPY: |
403 return std::string("_zero_copy_tile_task_worker_pool"); | 406 return std::string("_zero_copy_tile_task_worker_pool"); |
404 case TILE_TASK_WORKER_POOL_TYPE_ONE_COPY: | 407 case TILE_TASK_WORKER_POOL_TYPE_ONE_COPY: |
405 return std::string("_one_copy_tile_task_worker_pool"); | 408 return std::string("_one_copy_tile_task_worker_pool"); |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
456 | 459 |
457 class TileTaskWorkerPoolCommonPerfTest : public TileTaskWorkerPoolPerfTestBase, | 460 class TileTaskWorkerPoolCommonPerfTest : public TileTaskWorkerPoolPerfTestBase, |
458 public testing::Test { | 461 public testing::Test { |
459 public: | 462 public: |
460 // Overridden from testing::Test: | 463 // Overridden from testing::Test: |
461 void SetUp() override { | 464 void SetUp() override { |
462 output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass(); | 465 output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass(); |
463 CHECK(output_surface_->BindToClient(&output_surface_client_)); | 466 CHECK(output_surface_->BindToClient(&output_surface_client_)); |
464 resource_provider_ = | 467 resource_provider_ = |
465 ResourceProvider::Create(output_surface_.get(), NULL, NULL, NULL, 0, | 468 ResourceProvider::Create(output_surface_.get(), NULL, NULL, NULL, 0, |
466 false, 1).Pass(); | 469 false, false, 1).Pass(); |
467 } | 470 } |
468 | 471 |
469 void RunBuildTileTaskQueueTest(const std::string& test_name, | 472 void RunBuildTileTaskQueueTest(const std::string& test_name, |
470 unsigned num_raster_tasks, | 473 unsigned num_raster_tasks, |
471 unsigned num_image_decode_tasks) { | 474 unsigned num_image_decode_tasks) { |
472 ImageDecodeTask::Vector image_decode_tasks; | 475 ImageDecodeTask::Vector image_decode_tasks; |
473 RasterTaskVector raster_tasks; | 476 RasterTaskVector raster_tasks; |
474 CreateImageDecodeTasks(num_image_decode_tasks, &image_decode_tasks); | 477 CreateImageDecodeTasks(num_image_decode_tasks, &image_decode_tasks); |
475 CreateRasterTasks(num_raster_tasks, image_decode_tasks, &raster_tasks); | 478 CreateRasterTasks(num_raster_tasks, image_decode_tasks, &raster_tasks); |
476 | 479 |
(...skipping 16 matching lines...) Expand all Loading... |
493 RunBuildTileTaskQueueTest("1_0", 1, 0); | 496 RunBuildTileTaskQueueTest("1_0", 1, 0); |
494 RunBuildTileTaskQueueTest("32_0", 32, 0); | 497 RunBuildTileTaskQueueTest("32_0", 32, 0); |
495 RunBuildTileTaskQueueTest("1_1", 1, 1); | 498 RunBuildTileTaskQueueTest("1_1", 1, 1); |
496 RunBuildTileTaskQueueTest("32_1", 32, 1); | 499 RunBuildTileTaskQueueTest("32_1", 32, 1); |
497 RunBuildTileTaskQueueTest("1_4", 1, 4); | 500 RunBuildTileTaskQueueTest("1_4", 1, 4); |
498 RunBuildTileTaskQueueTest("32_4", 32, 4); | 501 RunBuildTileTaskQueueTest("32_4", 32, 4); |
499 } | 502 } |
500 | 503 |
501 } // namespace | 504 } // namespace |
502 } // namespace cc | 505 } // namespace cc |
OLD | NEW |