OLD | NEW |
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 if (fGrContext) { | 150 if (fGrContext) { |
151 // create a render target to back the device | 151 // create a render target to back the device |
152 GrSurfaceDesc desc; | 152 GrSurfaceDesc desc; |
153 desc.fConfig = kSkia8888_GrPixelConfig; | 153 desc.fConfig = kSkia8888_GrPixelConfig; |
154 desc.fFlags = kRenderTarget_GrSurfaceFlag; | 154 desc.fFlags = kRenderTarget_GrSurfaceFlag; |
155 desc.fWidth = width; | 155 desc.fWidth = width; |
156 desc.fHeight = height; | 156 desc.fHeight = height; |
157 desc.fSampleCnt = fSampleCount; | 157 desc.fSampleCnt = fSampleCount; |
158 target.reset(fGrContext->createUncachedTexture(desc, NULL, 0)); | 158 target.reset(fGrContext->createUncachedTexture(desc, NULL, 0)); |
159 } | 159 } |
160 if (NULL == target.get()) { | 160 |
161 SkASSERT(0); | 161 uint32_t flags = fUseDFText ? SkSurfaceProps::kUseDistanceFieldFonts
_Flag : 0; |
| 162 SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType
); |
| 163 SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(target->asRende
rTarget(), &props)); |
| 164 if (!device) { |
162 return NULL; | 165 return NULL; |
163 } | 166 } |
164 | 167 canvas = SkNEW_ARGS(SkCanvas, (device)); |
165 uint32_t flags = fUseDFText ? SkGpuDevice::kDFText_Flag : 0; | |
166 SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(target, | |
167 SkSurfaceProps(SkSurfaceProps::kLegacyF
ontHost_InitType), | |
168 flags)); | |
169 canvas = SkNEW_ARGS(SkCanvas, (device.get())); | |
170 break; | 168 break; |
171 } | 169 } |
172 #endif | 170 #endif |
173 default: | 171 default: |
174 SkASSERT(0); | 172 SkASSERT(0); |
175 return NULL; | 173 return NULL; |
176 } | 174 } |
177 setUpFilter(canvas, fDrawFilters); | 175 setUpFilter(canvas, fDrawFilters); |
178 this->scaleToScaleFactor(canvas); | 176 this->scaleToScaleFactor(canvas); |
179 | 177 |
(...skipping 682 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
862 PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts) { | 860 PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts) { |
863 return SkNEW_ARGS(GatherRenderer, (opts)); | 861 return SkNEW_ARGS(GatherRenderer, (opts)); |
864 } | 862 } |
865 #else | 863 #else |
866 PictureRenderer* CreateGatherPixelRefsRenderer() { | 864 PictureRenderer* CreateGatherPixelRefsRenderer() { |
867 return SkNEW(GatherRenderer); | 865 return SkNEW(GatherRenderer); |
868 } | 866 } |
869 #endif | 867 #endif |
870 | 868 |
871 } // namespace sk_tools | 869 } // namespace sk_tools |
OLD | NEW |