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

Side by Side Diff: cc/resources/gpu_rasterizer.cc

Issue 881513004: Add a command-line flag to set GPU rasterization multisampling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cache msaa sample count to avoid double-parsing it. Created 5 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 unified diff | Download patch
« no previous file with comments | « cc/resources/gpu_rasterizer.h ('k') | cc/resources/resource_provider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/gpu_rasterizer.h" 5 #include "cc/resources/gpu_rasterizer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 13 matching lines...) Expand all
24 #include "third_party/skia/include/core/SkSurface.h" 24 #include "third_party/skia/include/core/SkSurface.h"
25 #include "third_party/skia/include/gpu/GrContext.h" 25 #include "third_party/skia/include/gpu/GrContext.h"
26 26
27 namespace cc { 27 namespace cc {
28 28
29 // static 29 // static
30 scoped_ptr<GpuRasterizer> GpuRasterizer::Create( 30 scoped_ptr<GpuRasterizer> GpuRasterizer::Create(
31 ContextProvider* context_provider, 31 ContextProvider* context_provider,
32 ResourceProvider* resource_provider, 32 ResourceProvider* resource_provider,
33 bool use_distance_field_text, 33 bool use_distance_field_text,
34 bool tile_prepare_enabled) { 34 bool tile_prepare_enabled,
35 return make_scoped_ptr<GpuRasterizer>( 35 int msaa_sample_count) {
36 new GpuRasterizer(context_provider, resource_provider, 36 return make_scoped_ptr<GpuRasterizer>(new GpuRasterizer(
37 use_distance_field_text, tile_prepare_enabled)); 37 context_provider, resource_provider, use_distance_field_text,
38 tile_prepare_enabled, msaa_sample_count));
38 } 39 }
39 40
40 GpuRasterizer::GpuRasterizer(ContextProvider* context_provider, 41 GpuRasterizer::GpuRasterizer(ContextProvider* context_provider,
41 ResourceProvider* resource_provider, 42 ResourceProvider* resource_provider,
42 bool use_distance_field_text, 43 bool use_distance_field_text,
43 bool tile_prepare_enabled) 44 bool tile_prepare_enabled,
45 int msaa_sample_count)
44 : context_provider_(context_provider), 46 : context_provider_(context_provider),
45 resource_provider_(resource_provider), 47 resource_provider_(resource_provider),
46 use_distance_field_text_(use_distance_field_text), 48 use_distance_field_text_(use_distance_field_text),
47 tile_prepare_enabled_(tile_prepare_enabled) { 49 tile_prepare_enabled_(tile_prepare_enabled),
50 msaa_sample_count_(msaa_sample_count) {
48 DCHECK(context_provider_); 51 DCHECK(context_provider_);
49 } 52 }
50 53
51 GpuRasterizer::~GpuRasterizer() { 54 GpuRasterizer::~GpuRasterizer() {
52 } 55 }
53 56
54 PrepareTilesMode GpuRasterizer::GetPrepareTilesMode() { 57 PrepareTilesMode GpuRasterizer::GetPrepareTilesMode() {
55 return tile_prepare_enabled_ ? PrepareTilesMode::PREPARE_PRIORITIZED_TILES 58 return tile_prepare_enabled_ ? PrepareTilesMode::PREPARE_PRIORITIZED_TILES
56 : PrepareTilesMode::PREPARE_NONE; 59 : PrepareTilesMode::PREPARE_NONE;
57 } 60 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 DCHECK(tile->raster_source()); 119 DCHECK(tile->raster_source());
117 120
118 // Turn on distance fields for layers that have ever animated. 121 // Turn on distance fields for layers that have ever animated.
119 bool use_distance_field_text = 122 bool use_distance_field_text =
120 use_distance_field_text_ || 123 use_distance_field_text_ ||
121 tile->raster_source()->ShouldAttemptToUseDistanceFieldText(); 124 tile->raster_source()->ShouldAttemptToUseDistanceFieldText();
122 scoped_ptr<ResourceProvider::ScopedWriteLockGr> lock( 125 scoped_ptr<ResourceProvider::ScopedWriteLockGr> lock(
123 new ResourceProvider::ScopedWriteLockGr(resource_provider_, 126 new ResourceProvider::ScopedWriteLockGr(resource_provider_,
124 resource->id())); 127 resource->id()));
125 SkSurface* sk_surface = lock->GetSkSurface( 128 SkSurface* sk_surface = lock->GetSkSurface(
126 use_distance_field_text, tile->raster_source()->CanUseLCDText()); 129 use_distance_field_text, tile->raster_source()->CanUseLCDText(),
130 msaa_sample_count_);
127 131
128 locks->push_back(lock.Pass()); 132 locks->push_back(lock.Pass());
129 133
130 if (!sk_surface) 134 if (!sk_surface)
131 return; 135 return;
132 136
133 SkRTreeFactory factory; 137 SkRTreeFactory factory;
134 SkPictureRecorder recorder; 138 SkPictureRecorder recorder;
135 gfx::Size size = resource->size(); 139 gfx::Size size = resource->size();
136 const int flags = SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag; 140 const int flags = SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag;
137 skia::RefPtr<SkCanvas> canvas = skia::SharePtr( 141 skia::RefPtr<SkCanvas> canvas = skia::SharePtr(
138 recorder.beginRecording(size.width(), size.height(), &factory, flags)); 142 recorder.beginRecording(size.width(), size.height(), &factory, flags));
139 143
140 canvas->save(); 144 canvas->save();
141 tile->raster_source()->PlaybackToCanvas(canvas.get(), tile->content_rect(), 145 tile->raster_source()->PlaybackToCanvas(canvas.get(), tile->content_rect(),
142 tile->contents_scale()); 146 tile->contents_scale());
143 canvas->restore(); 147 canvas->restore();
144 148
145 // Add the canvas and recorded picture to |multi_picture_draw_|. 149 // Add the canvas and recorded picture to |multi_picture_draw_|.
146 skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording()); 150 skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());
147 multi_picture_draw_.add(sk_surface->getCanvas(), picture.get()); 151 multi_picture_draw_.add(sk_surface->getCanvas(), picture.get());
148 } 152 }
149 153
150 } // namespace cc 154 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/gpu_rasterizer.h ('k') | cc/resources/resource_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698