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

Unified Diff: cc/test/layer_tree_pixel_resource_test.cc

Issue 1186393004: gpu: Remove async texture uploads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 4 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.h ('k') | cc/test/test_gles2_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_pixel_resource_test.cc
diff --git a/cc/test/layer_tree_pixel_resource_test.cc b/cc/test/layer_tree_pixel_resource_test.cc
index f844d8a54b263badd71012ae20999a683ca4b82c..6ea1b022fa91b1dce681a24572fcf30dae688f43 100644
--- a/cc/test/layer_tree_pixel_resource_test.cc
+++ b/cc/test/layer_tree_pixel_resource_test.cc
@@ -9,7 +9,6 @@
#include "cc/raster/gpu_rasterizer.h"
#include "cc/raster/gpu_tile_task_worker_pool.h"
#include "cc/raster/one_copy_tile_task_worker_pool.h"
-#include "cc/raster/pixel_buffer_tile_task_worker_pool.h"
#include "cc/raster/tile_task_worker_pool.h"
#include "cc/raster/zero_copy_tile_task_worker_pool.h"
#include "cc/resources/resource_pool.h"
@@ -28,7 +27,6 @@ bool IsTestCaseSupported(PixelResourceTestCase test_case) {
case GL_ZERO_COPY_RECT_DRAW:
case GL_ONE_COPY_2D_STAGING_2D_DRAW:
case GL_ONE_COPY_RECT_STAGING_2D_DRAW:
- case GL_ASYNC_UPLOAD_2D_DRAW:
return true;
case GL_ZERO_COPY_EXTERNAL_DRAW:
case GL_ONE_COPY_EXTERNAL_STAGING_2D_DRAW:
@@ -103,11 +101,6 @@ void LayerTreeHostPixelResourceTest::InitializeFromTestCase(
draw_texture_target_ = GL_TEXTURE_EXTERNAL_OES;
resource_pool_option_ = ZERO_COPY_TILE_TASK_WORKER_POOL;
return;
- case GL_ASYNC_UPLOAD_2D_DRAW:
- test_type_ = PIXEL_TEST_GL;
- draw_texture_target_ = GL_TEXTURE_2D;
- resource_pool_option_ = PIXEL_BUFFER_TILE_TASK_WORKER_POOL;
- return;
}
NOTREACHED();
}
@@ -125,7 +118,6 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
ContextProvider* context_provider =
host_impl->output_surface()->context_provider();
ResourceProvider* resource_provider = host_impl->resource_provider();
- size_t max_transfer_buffer_usage_bytes = 1024u * 1024u * 60u;
int max_bytes_per_copy_operation = 1024 * 1024;
int max_staging_buffers = 32;
@@ -170,16 +162,6 @@ void LayerTreeHostPixelResourceTest::CreateResourceAndTileTaskWorkerPool(
task_runner, task_graph_runner(), context_provider, resource_provider,
max_bytes_per_copy_operation, false, max_staging_buffers);
break;
- case PIXEL_BUFFER_TILE_TASK_WORKER_POOL:
- EXPECT_TRUE(context_provider);
- EXPECT_EQ(PIXEL_TEST_GL, test_type_);
- *resource_pool = ResourcePool::Create(resource_provider, task_runner,
- draw_texture_target_);
-
- *tile_task_worker_pool = PixelBufferTileTaskWorkerPool::Create(
- task_runner, task_graph_runner(), context_provider, resource_provider,
- max_transfer_buffer_usage_bytes);
- break;
}
}
« no previous file with comments | « cc/test/layer_tree_pixel_resource_test.h ('k') | cc/test/test_gles2_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698