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

Side by Side Diff: tools/PictureRenderer.cpp

Issue 682223002: rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: const 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 | « tests/WritePixelsTest.cpp ('k') | no next file » | 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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 #endif 141 #endif
142 #if SK_MESA 142 #if SK_MESA
143 case kMesa_DeviceType: 143 case kMesa_DeviceType:
144 // fall through 144 // fall through
145 #endif 145 #endif
146 case kGPU_DeviceType: 146 case kGPU_DeviceType:
147 case kNVPR_DeviceType: { 147 case kNVPR_DeviceType: {
148 SkAutoTUnref<GrSurface> target; 148 SkAutoTUnref<GrSurface> target;
149 if (fGrContext) { 149 if (fGrContext) {
150 // create a render target to back the device 150 // create a render target to back the device
151 GrTextureDesc desc; 151 GrSurfaceDesc desc;
152 desc.fConfig = kSkia8888_GrPixelConfig; 152 desc.fConfig = kSkia8888_GrPixelConfig;
153 desc.fFlags = kRenderTarget_GrTextureFlagBit; 153 desc.fFlags = kRenderTarget_GrSurfaceFlag;
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
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts) { 843 PictureRenderer* CreateGatherPixelRefsRenderer(const GrContext::Options& opts) {
844 return SkNEW_ARGS(GatherRenderer, (opts)); 844 return SkNEW_ARGS(GatherRenderer, (opts));
845 } 845 }
846 #else 846 #else
847 PictureRenderer* CreateGatherPixelRefsRenderer() { 847 PictureRenderer* CreateGatherPixelRefsRenderer() {
848 return SkNEW(GatherRenderer); 848 return SkNEW(GatherRenderer);
849 } 849 }
850 #endif 850 #endif
851 851
852 } // namespace sk_tools 852 } // namespace sk_tools
OLDNEW
« no previous file with comments | « tests/WritePixelsTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698