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

Side by Side Diff: tools/PictureRenderer.cpp

Issue 707723005: Revert of Get gpudft support working in dm, gm, nanobench and bench_pictures (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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 | « tools/PictureRenderer.h ('k') | tools/PictureRenderingFlags.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "PictureRenderer.h" 8 #include "PictureRenderer.h"
9 #include "picture_utils.h" 9 #include "picture_utils.h"
10 #include "SamplePipeControllers.h" 10 #include "SamplePipeControllers.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 desc.fWidth = width; 154 desc.fWidth = width;
155 desc.fHeight = height; 155 desc.fHeight = height;
156 desc.fSampleCnt = fSampleCount; 156 desc.fSampleCnt = fSampleCount;
157 target.reset(fGrContext->createUncachedTexture(desc, NULL, 0)); 157 target.reset(fGrContext->createUncachedTexture(desc, NULL, 0));
158 } 158 }
159 if (NULL == target.get()) { 159 if (NULL == target.get()) {
160 SkASSERT(0); 160 SkASSERT(0);
161 return NULL; 161 return NULL;
162 } 162 }
163 163
164 uint32_t flags = fUseDFText ? SkGpuDevice::kDFText_Flag : 0;
165 SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(target, 164 SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(target,
166 SkSurfaceProps(SkSurfaceProps::kLegacyF ontHost_InitType), 165 SkSurfaceProps(SkSurfaceProps::kLegacyF ontHost_InitType)));
167 flags));
168 canvas = SkNEW_ARGS(SkCanvas, (device.get())); 166 canvas = SkNEW_ARGS(SkCanvas, (device.get()));
169 break; 167 break;
170 } 168 }
171 #endif 169 #endif
172 default: 170 default:
173 SkASSERT(0); 171 SkASSERT(0);
174 return NULL; 172 return NULL;
175 } 173 }
176 setUpFilter(canvas, fDrawFilters); 174 setUpFilter(canvas, fDrawFilters);
177 this->scaleToScaleFactor(canvas); 175 this->scaleToScaleFactor(canvas);
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts) { 843 PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts) {
846 return SkNEW_ARGS(GatherRenderer, (opts)); 844 return SkNEW_ARGS(GatherRenderer, (opts));
847 } 845 }
848 #else 846 #else
849 PictureRenderer* CreateGatherPixelRefsRenderer() { 847 PictureRenderer* CreateGatherPixelRefsRenderer() {
850 return SkNEW(GatherRenderer); 848 return SkNEW(GatherRenderer);
851 } 849 }
852 #endif 850 #endif
853 851
854 } // namespace sk_tools 852 } // namespace sk_tools
OLDNEW
« no previous file with comments | « tools/PictureRenderer.h ('k') | tools/PictureRenderingFlags.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698