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

Side by Side Diff: cc/raster/zero_copy_tile_task_worker_pool.cc

Issue 1379783002: Allow one-copy task tile worker pool to use compressed textures. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove needs_conversion, fix tile size unit test and move modulo 4 DCHECK (for tests) Created 5 years 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
OLDNEW
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/raster/zero_copy_tile_task_worker_pool.h" 5 #include "cc/raster/zero_copy_tile_task_worker_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl); 58 DISALLOW_COPY_AND_ASSIGN(RasterBufferImpl);
59 }; 59 };
60 60
61 } // namespace 61 } // namespace
62 62
63 // static 63 // static
64 scoped_ptr<TileTaskWorkerPool> ZeroCopyTileTaskWorkerPool::Create( 64 scoped_ptr<TileTaskWorkerPool> ZeroCopyTileTaskWorkerPool::Create(
65 base::SequencedTaskRunner* task_runner, 65 base::SequencedTaskRunner* task_runner,
66 TaskGraphRunner* task_graph_runner, 66 TaskGraphRunner* task_graph_runner,
67 ResourceProvider* resource_provider, 67 ResourceProvider* resource_provider,
68 bool use_rgba_4444_texture_format) { 68 ResourceFormat preferred_tile_format) {
69 return make_scoped_ptr<TileTaskWorkerPool>(new ZeroCopyTileTaskWorkerPool( 69 return make_scoped_ptr<TileTaskWorkerPool>(
70 task_runner, task_graph_runner, resource_provider, 70 new ZeroCopyTileTaskWorkerPool(task_runner, task_graph_runner,
71 use_rgba_4444_texture_format)); 71 resource_provider, preferred_tile_format));
72 } 72 }
73 73
74 ZeroCopyTileTaskWorkerPool::ZeroCopyTileTaskWorkerPool( 74 ZeroCopyTileTaskWorkerPool::ZeroCopyTileTaskWorkerPool(
75 base::SequencedTaskRunner* task_runner, 75 base::SequencedTaskRunner* task_runner,
76 TaskGraphRunner* task_graph_runner, 76 TaskGraphRunner* task_graph_runner,
77 ResourceProvider* resource_provider, 77 ResourceProvider* resource_provider,
78 bool use_rgba_4444_texture_format) 78 ResourceFormat preferred_tile_format)
79 : task_runner_(task_runner), 79 : task_runner_(task_runner),
80 task_graph_runner_(task_graph_runner), 80 task_graph_runner_(task_graph_runner),
81 namespace_token_(task_graph_runner->GetNamespaceToken()), 81 namespace_token_(task_graph_runner->GetNamespaceToken()),
82 resource_provider_(resource_provider), 82 resource_provider_(resource_provider),
83 use_rgba_4444_texture_format_(use_rgba_4444_texture_format) {} 83 preferred_tile_format_(preferred_tile_format) {}
84 84
85 ZeroCopyTileTaskWorkerPool::~ZeroCopyTileTaskWorkerPool() { 85 ZeroCopyTileTaskWorkerPool::~ZeroCopyTileTaskWorkerPool() {
86 } 86 }
87 87
88 TileTaskRunner* ZeroCopyTileTaskWorkerPool::AsTileTaskRunner() { 88 TileTaskRunner* ZeroCopyTileTaskWorkerPool::AsTileTaskRunner() {
89 return this; 89 return this;
90 } 90 }
91 91
92 void ZeroCopyTileTaskWorkerPool::Shutdown() { 92 void ZeroCopyTileTaskWorkerPool::Shutdown() {
93 TRACE_EVENT0("cc", "ZeroCopyTileTaskWorkerPool::Shutdown"); 93 TRACE_EVENT0("cc", "ZeroCopyTileTaskWorkerPool::Shutdown");
(...skipping 21 matching lines...) Expand all
115 115
116 task->WillComplete(); 116 task->WillComplete();
117 task->CompleteOnOriginThread(this); 117 task->CompleteOnOriginThread(this);
118 task->DidComplete(); 118 task->DidComplete();
119 } 119 }
120 completed_tasks_.clear(); 120 completed_tasks_.clear();
121 } 121 }
122 122
123 ResourceFormat ZeroCopyTileTaskWorkerPool::GetResourceFormat( 123 ResourceFormat ZeroCopyTileTaskWorkerPool::GetResourceFormat(
124 bool must_support_alpha) const { 124 bool must_support_alpha) const {
125 return use_rgba_4444_texture_format_ 125 if (resource_provider_->IsResourceFormatSupported(preferred_tile_format_) &&
126 ? RGBA_4444 126 (DoesResourceFormatSupportAlpha(preferred_tile_format_) ||
127 : resource_provider_->best_texture_format(); 127 !must_support_alpha)) {
128 return preferred_tile_format_;
129 }
130
131 return resource_provider_->best_texture_format();
128 } 132 }
129 133
130 bool ZeroCopyTileTaskWorkerPool::GetResourceRequiresSwizzle( 134 bool ZeroCopyTileTaskWorkerPool::GetResourceRequiresSwizzle(
131 bool must_support_alpha) const { 135 bool must_support_alpha) const {
132 return !PlatformColor::SameComponentOrder( 136 return !PlatformColor::SameComponentOrder(
133 GetResourceFormat(must_support_alpha)); 137 GetResourceFormat(must_support_alpha));
134 } 138 }
135 139
136 scoped_ptr<RasterBuffer> ZeroCopyTileTaskWorkerPool::AcquireBufferForRaster( 140 scoped_ptr<RasterBuffer> ZeroCopyTileTaskWorkerPool::AcquireBufferForRaster(
137 const Resource* resource, 141 const Resource* resource,
138 uint64_t resource_content_id, 142 uint64_t resource_content_id,
139 uint64_t previous_content_id) { 143 uint64_t previous_content_id) {
140 return make_scoped_ptr<RasterBuffer>( 144 return make_scoped_ptr<RasterBuffer>(
141 new RasterBufferImpl(resource_provider_, resource)); 145 new RasterBufferImpl(resource_provider_, resource));
142 } 146 }
143 147
144 void ZeroCopyTileTaskWorkerPool::ReleaseBufferForRaster( 148 void ZeroCopyTileTaskWorkerPool::ReleaseBufferForRaster(
145 scoped_ptr<RasterBuffer> buffer) { 149 scoped_ptr<RasterBuffer> buffer) {
146 // Nothing to do here. RasterBufferImpl destructor cleans up after itself. 150 // Nothing to do here. RasterBufferImpl destructor cleans up after itself.
147 } 151 }
148 152
149 } // namespace cc 153 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698