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

Unified Diff: cc/resources/image_raster_worker_pool.cc

Issue 110883015: Add preliminary support for hw-accelerated tile rasterization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: avoid implementing TestContextProvider::GrContext for now Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/image_raster_worker_pool.h ('k') | cc/resources/pixel_buffer_raster_worker_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/image_raster_worker_pool.cc
diff --git a/cc/resources/image_raster_worker_pool.cc b/cc/resources/image_raster_worker_pool.cc
index 90572ab417dedc02c00d3d082ce2ca94643e3449..024d04fc102fd906f7004ae3be8b8aefac6a347d 100644
--- a/cc/resources/image_raster_worker_pool.cc
+++ b/cc/resources/image_raster_worker_pool.cc
@@ -58,9 +58,10 @@ class ImageWorkerPoolTaskImpl : public internal::WorkerPoolTask {
ImageRasterWorkerPool::ImageRasterWorkerPool(
ResourceProvider* resource_provider,
+ ContextProvider* context_provider,
size_t num_threads,
GLenum texture_target)
- : RasterWorkerPool(resource_provider, num_threads),
+ : RasterWorkerPool(resource_provider, context_provider, num_threads),
texture_target_(texture_target),
raster_tasks_pending_(false),
raster_tasks_required_for_activation_pending_(false) {
@@ -100,12 +101,19 @@ void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
priority++,
&graph);
+ RasterTaskVector gpu_raster_tasks;
+
for (RasterTaskVector::const_iterator it = raster_tasks().begin();
it != raster_tasks().end(); ++it) {
internal::RasterWorkerPoolTask* task = it->get();
DCHECK(!task->HasCompleted());
DCHECK(!task->WasCanceled());
+ if (task->use_gpu_rasterization()) {
+ gpu_raster_tasks.push_back(task);
+ continue;
+ }
+
TaskMap::iterator image_it = image_tasks_.find(task);
if (image_it != image_tasks_.end()) {
internal::WorkerPoolTask* image_task = image_it->second.get();
@@ -152,6 +160,8 @@ void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
set_raster_required_for_activation_finished_task(
new_raster_required_for_activation_finished_task);
+ RunGpuRasterTasks(gpu_raster_tasks);
+
TRACE_EVENT_ASYNC_STEP_INTO1(
"cc", "ScheduledTasks", this, "rasterizing",
"state", TracedValue::FromValue(StateAsValue().release()));
@@ -187,6 +197,7 @@ void ImageRasterWorkerPool::OnRasterTaskCompleted(
TRACE_EVENT1("cc", "ImageRasterWorkerPool::OnRasterTaskCompleted",
"was_canceled", was_canceled);
+ DCHECK(!task->use_gpu_rasterization());
DCHECK(image_tasks_.find(task.get()) != image_tasks_.end());
// Balanced with MapImage() call in ScheduleTasks().
« no previous file with comments | « cc/resources/image_raster_worker_pool.h ('k') | cc/resources/pixel_buffer_raster_worker_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698