Solo gp

gm/rrects.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #if SK_SUPPORT_GPU
 #include "GrTest.h"
@@ skipping 68 matching lines @@
         }
 
         static const SkRect kMaxTileBound = SkRect::MakeWH(SkIntToScalar(kTileX),
                                                            SkIntToScalar(kTileY));
 #ifdef SK_DEBUG
         static const SkRect kMaxImageBound = SkRect::MakeWH(SkIntToScalar(kImageWidth),
                                                             SkIntToScalar(kImageHeight));
 #endif
 
 #if SK_SUPPORT_GPU
-        int lastEdgeType = (kEffect_Type == fType) ? kLast_GrEffectEdgeType: 0;
+        int lastEdgeType = (kEffect_Type == fType) ? kLast_GrProcessorEdgeType: 0;
 #else
         int lastEdgeType = 0;
 #endif
 
         int y = 1;
         for (int et = 0; et <= lastEdgeType; ++et) {
             int x = 1;
             for (int curRRect = 0; curRRect < kNumRRects; ++curRRect) {
                 bool drew = true;
 #ifdef SK_DEBUG
                 SkASSERT(kMaxTileBound.contains(fRRects[curRRect].getBounds()));
                 SkRect imageSpaceBounds = fRRects[curRRect].getBounds();
                 imageSpaceBounds.offset(SkIntToScalar(x), SkIntToScalar(y));
                 SkASSERT(kMaxImageBound.contains(imageSpaceBounds));
 #endif
                 canvas->save();
                     canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
                     if (kEffect_Type == fType) {
 #if SK_SUPPORT_GPU
                         GrTestTarget tt;
                         context->getTestTarget(&tt);
                         if (NULL == tt.target()) {
                             SkDEBUGFAIL("Couldn't get Gr test target.");
                             return;
                         }
                         GrDrawState* drawState = tt.target()->drawState();
 
                         SkRRect rrect = fRRects[curRRect];
                         rrect.offset(SkIntToScalar(x), SkIntToScalar(y));
-                        GrEffectEdgeType edgeType = (GrEffectEdgeType) et;
-                        SkAutoTUnref<GrEffect> effect(GrRRectEffect::Create(edgeType, rrect));
-                        if (effect) {
-                            drawState->addCoverageEffect(effect);
+                        GrPrimitiveEdgeType edgeType = (GrPrimitiveEdgeType) et;
+                        SkAutoTUnref<GrFragmentProcessor> fp(GrRRectEffect::Create(edgeType,
+                                                                                   rrect));
+                        if (fp) {
+                            drawState->addCoverageProcessor(fp);
                             drawState->setIdentityViewMatrix();
                             drawState->setRenderTarget(rt);
                             drawState->setColor(0xff000000);
 
                             SkRect bounds = rrect.getBounds();
                             bounds.outset(2.f, 2.f);
 
                             tt.target()->drawSimpleRect(bounds);
                         } else {
                             drew = false;
@@ skipping 128 matching lines @@
 
 DEF_GM( return new RRectGM(RRectGM::kAA_Draw_Type); )
 DEF_GM( return new RRectGM(RRectGM::kBW_Draw_Type); )
 DEF_GM( return new RRectGM(RRectGM::kAA_Clip_Type); )
 DEF_GM( return new RRectGM(RRectGM::kBW_Clip_Type); )
 #if SK_SUPPORT_GPU
 DEF_GM( return new RRectGM(RRectGM::kEffect_Type); )
 #endif
 
 }