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

Side by Side Diff: cc/raster/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: Use memory_efficient_format* settings and revert allocation modifications 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/tile_task_worker_pool.h" 5 #include "cc/raster/tile_task_worker_pool.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "cc/playback/display_list_raster_source.h" 10 #include "cc/playback/display_list_raster_source.h"
11 #include "cc/raster/texture_compressor.h"
11 #include "skia/ext/refptr.h" 12 #include "skia/ext/refptr.h"
12 #include "third_party/skia/include/core/SkCanvas.h" 13 #include "third_party/skia/include/core/SkCanvas.h"
13 #include "third_party/skia/include/core/SkDrawFilter.h" 14 #include "third_party/skia/include/core/SkDrawFilter.h"
14 #include "third_party/skia/include/core/SkSurface.h" 15 #include "third_party/skia/include/core/SkSurface.h"
15 16
16 namespace cc { 17 namespace cc {
17 namespace { 18 namespace {
18 19
19 class TaskSetFinishedTaskImpl : public TileTask { 20 class TaskSetFinishedTaskImpl : public TileTask {
20 public: 21 public:
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 } 135 }
135 136
136 InsertNodeForTask(graph, raster_task, priority, dependencies); 137 InsertNodeForTask(graph, raster_task, priority, dependencies);
137 } 138 }
138 139
139 static bool IsSupportedPlaybackToMemoryFormat(ResourceFormat format) { 140 static bool IsSupportedPlaybackToMemoryFormat(ResourceFormat format) {
140 switch (format) { 141 switch (format) {
141 case RGBA_4444: 142 case RGBA_4444:
142 case RGBA_8888: 143 case RGBA_8888:
143 case BGRA_8888: 144 case BGRA_8888:
145 case ETC1:
144 return true; 146 return true;
145 case ALPHA_8: 147 case ALPHA_8:
146 case LUMINANCE_8: 148 case LUMINANCE_8:
147 case RGB_565: 149 case RGB_565:
148 case ETC1:
149 case RED_8: 150 case RED_8:
150 return false; 151 return false;
151 } 152 }
152 NOTREACHED(); 153 NOTREACHED();
153 return false; 154 return false;
154 } 155 }
155 156
156 class SkipImageFilter : public SkDrawFilter { 157 class SkipImageFilter : public SkDrawFilter {
157 public: 158 public:
158 bool filter(SkPaint* paint, Type type) override { 159 bool filter(SkPaint* paint, Type type) override {
(...skipping 16 matching lines...) Expand all
175 const gfx::Rect& canvas_playback_rect, 176 const gfx::Rect& canvas_playback_rect,
176 float scale, 177 float scale,
177 bool include_images) { 178 bool include_images) {
178 TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory"); 179 TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory");
179 180
180 DCHECK(IsSupportedPlaybackToMemoryFormat(format)) << format; 181 DCHECK(IsSupportedPlaybackToMemoryFormat(format)) << format;
181 182
182 // Uses kPremul_SkAlphaType since the result is not known to be opaque. 183 // Uses kPremul_SkAlphaType since the result is not known to be opaque.
183 SkImageInfo info = 184 SkImageInfo info =
184 SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType); 185 SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType);
185 SkColorType buffer_color_type = ResourceFormatToSkColorType(format); 186 bool needs_conversion =
186 bool needs_copy = buffer_color_type != info.colorType(); 187 SkColorTypeToResourceFormat(info.colorType()) != format;
187 188
188 // Use unknown pixel geometry to disable LCD text. 189 // Use unknown pixel geometry to disable LCD text.
189 SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry); 190 SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry);
190 if (raster_source->CanUseLCDText()) { 191 if (raster_source->CanUseLCDText()) {
191 // LegacyFontHost will get LCD text and skia figures out what type to use. 192 // LegacyFontHost will get LCD text and skia figures out what type to use.
192 surface_props = SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType); 193 surface_props = SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
193 } 194 }
194 195
195 if (!stride) 196 if (!stride)
196 stride = info.minRowBytes(); 197 stride = info.minRowBytes();
197 DCHECK_GT(stride, 0u); 198 DCHECK_GT(stride, 0u);
198 199
199 skia::RefPtr<SkDrawFilter> image_filter; 200 skia::RefPtr<SkDrawFilter> image_filter;
200 if (!include_images) 201 if (!include_images)
201 image_filter = skia::AdoptRef(new SkipImageFilter); 202 image_filter = skia::AdoptRef(new SkipImageFilter);
202 203
203 if (!needs_copy) { 204 if (!needs_conversion) {
204 skia::RefPtr<SkSurface> surface = skia::AdoptRef( 205 skia::RefPtr<SkSurface> surface = skia::AdoptRef(
205 SkSurface::NewRasterDirect(info, memory, stride, &surface_props)); 206 SkSurface::NewRasterDirect(info, memory, stride, &surface_props));
206 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas()); 207 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas());
207 canvas->setDrawFilter(image_filter.get()); 208 canvas->setDrawFilter(image_filter.get());
208 raster_source->PlaybackToCanvas(canvas.get(), canvas_bitmap_rect, 209 raster_source->PlaybackToCanvas(canvas.get(), canvas_bitmap_rect,
209 canvas_playback_rect, scale); 210 canvas_playback_rect, scale);
210 return; 211 return;
211 } 212 }
212 213
213 skia::RefPtr<SkSurface> surface = 214 skia::RefPtr<SkSurface> surface =
214 skia::AdoptRef(SkSurface::NewRaster(info, &surface_props)); 215 skia::AdoptRef(SkSurface::NewRaster(info, &surface_props));
215 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas()); 216 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(surface->getCanvas());
216 canvas->setDrawFilter(image_filter.get()); 217 canvas->setDrawFilter(image_filter.get());
217 // TODO(reveman): Improve partial raster support by reducing the size of 218 // TODO(reveman): Improve partial raster support by reducing the size of
218 // playback rect passed to PlaybackToCanvas. crbug.com/519070 219 // playback rect passed to PlaybackToCanvas. crbug.com/519070
219 raster_source->PlaybackToCanvas(canvas.get(), canvas_bitmap_rect, 220 raster_source->PlaybackToCanvas(canvas.get(), canvas_bitmap_rect,
220 canvas_bitmap_rect, scale); 221 canvas_bitmap_rect, scale);
221 222
222 { 223 {
223 TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory::ConvertPixels"); 224 TRACE_EVENT0("cc", "TileTaskWorkerPool::PlaybackToMemory::ConvertPixels");
224 225
225 SkImageInfo dst_info = 226 switch (format) {
226 SkImageInfo::Make(info.width(), info.height(), buffer_color_type, 227 case ETC1: {
227 info.alphaType(), info.profileType()); 228 scoped_ptr<TextureCompressor> texture_compressor =
228 bool rv = canvas->readPixels(dst_info, memory, stride, 0, 0); 229 TextureCompressor::Create(TextureCompressor::kFormatETC1);
229 DCHECK(rv); 230 texture_compressor->Compress(reinterpret_cast<const uint8_t*>(
231 surface->peekPixels(nullptr, nullptr)),
232 reinterpret_cast<uint8_t*>(memory),
233 size.width(), size.height(),
234 TextureCompressor::kQualityHigh);
235 return;
236 }
237 case RGBA_8888:
reveman 2015/11/30 16:41:45 nit: some of these are not valid here (e.g. RGB_56
christiank 2015/12/01 15:01:07 Done.
238 case RGBA_4444:
239 case BGRA_8888:
240 case ALPHA_8:
241 case LUMINANCE_8:
242 case RGB_565:
243 case RED_8:
244 SkImageInfo dst_info = SkImageInfo::Make(
245 info.width(), info.height(), ResourceFormatToSkColorType(format),
246 info.alphaType(), info.profileType());
247 bool rv = canvas->readPixels(dst_info, memory, stride, 0, 0);
248 DCHECK(rv);
249 return;
250 }
251
252 NOTREACHED();
230 } 253 }
231 } 254 }
232 255
233 } // namespace cc 256 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698