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

Side by Side Diff: gm/rrects.cpp

Issue 732693002: Drawstate on stack (Closed) Base URL: https://skia.googlesource.com/skia.git@real_def_gp
Patch Set: tiny fix 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 | « gm/convexpolyeffect.cpp ('k') | gm/texturedomaineffect.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 "gm.h" 8 #include "gm.h"
9 #if SK_SUPPORT_GPU 9 #if SK_SUPPORT_GPU
10 #include "GrTest.h" 10 #include "GrTest.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 canvas->save(); 105 canvas->save();
106 canvas->translate(SkIntToScalar(x), SkIntToScalar(y)); 106 canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
107 if (kEffect_Type == fType) { 107 if (kEffect_Type == fType) {
108 #if SK_SUPPORT_GPU 108 #if SK_SUPPORT_GPU
109 GrTestTarget tt; 109 GrTestTarget tt;
110 context->getTestTarget(&tt); 110 context->getTestTarget(&tt);
111 if (NULL == tt.target()) { 111 if (NULL == tt.target()) {
112 SkDEBUGFAIL("Couldn't get Gr test target."); 112 SkDEBUGFAIL("Couldn't get Gr test target.");
113 return; 113 return;
114 } 114 }
115 GrDrawState* drawState = tt.target()->drawState(); 115 GrDrawState drawState;
116 116
117 SkRRect rrect = fRRects[curRRect]; 117 SkRRect rrect = fRRects[curRRect];
118 rrect.offset(SkIntToScalar(x), SkIntToScalar(y)); 118 rrect.offset(SkIntToScalar(x), SkIntToScalar(y));
119 GrPrimitiveEdgeType edgeType = (GrPrimitiveEdgeType) et; 119 GrPrimitiveEdgeType edgeType = (GrPrimitiveEdgeType) et;
120 SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Crea te(edgeType, 120 SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Crea te(edgeType,
121 rrect)); 121 rrect));
122 if (fp) { 122 if (fp) {
123 drawState->addCoverageProcessor(fp); 123 drawState.addCoverageProcessor(fp);
124 drawState->setIdentityViewMatrix(); 124 drawState.setIdentityViewMatrix();
125 drawState->setRenderTarget(rt); 125 drawState.setRenderTarget(rt);
126 drawState->setColor(0xff000000); 126 drawState.setColor(0xff000000);
127 127
128 SkRect bounds = rrect.getBounds(); 128 SkRect bounds = rrect.getBounds();
129 bounds.outset(2.f, 2.f); 129 bounds.outset(2.f, 2.f);
130 130
131 tt.target()->drawSimpleRect(bounds); 131 tt.target()->drawSimpleRect(&drawState, bounds);
132 } else { 132 } else {
133 drew = false; 133 drew = false;
134 } 134 }
135 #endif 135 #endif
136 } else if (kBW_Clip_Type == fType || kAA_Clip_Type == fType) { 136 } else if (kBW_Clip_Type == fType || kAA_Clip_Type == fType) {
137 bool aaClip = (kAA_Clip_Type == fType); 137 bool aaClip = (kAA_Clip_Type == fType);
138 canvas->clipRRect(fRRects[curRRect], SkRegion::kReplace_ Op, aaClip); 138 canvas->clipRRect(fRRects[curRRect], SkRegion::kReplace_ Op, aaClip);
139 canvas->drawRect(kMaxTileBound, paint); 139 canvas->drawRect(kMaxTileBound, paint);
140 } else { 140 } else {
141 canvas->drawRRect(fRRects[curRRect], paint); 141 canvas->drawRRect(fRRects[curRRect], paint);
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 262
263 DEF_GM( return new RRectGM(RRectGM::kAA_Draw_Type); ) 263 DEF_GM( return new RRectGM(RRectGM::kAA_Draw_Type); )
264 DEF_GM( return new RRectGM(RRectGM::kBW_Draw_Type); ) 264 DEF_GM( return new RRectGM(RRectGM::kBW_Draw_Type); )
265 DEF_GM( return new RRectGM(RRectGM::kAA_Clip_Type); ) 265 DEF_GM( return new RRectGM(RRectGM::kAA_Clip_Type); )
266 DEF_GM( return new RRectGM(RRectGM::kBW_Clip_Type); ) 266 DEF_GM( return new RRectGM(RRectGM::kBW_Clip_Type); )
267 #if SK_SUPPORT_GPU 267 #if SK_SUPPORT_GPU
268 DEF_GM( return new RRectGM(RRectGM::kEffect_Type); ) 268 DEF_GM( return new RRectGM(RRectGM::kEffect_Type); )
269 #endif 269 #endif
270 270
271 } 271 }
OLDNEW
« no previous file with comments | « gm/convexpolyeffect.cpp ('k') | gm/texturedomaineffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698