Make GrConvexPolyEffect support inverse fills and non-AA rects

gm/convexpolyeffect.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 26 matching lines @@
     ConvexPolyEffect() {
         this->setBGColor(0xFFFFFFFF);
     }
 
 protected:
     virtual SkString onShortName() SK_OVERRIDE {
         return SkString("convex_poly_effect");
     }
 
     virtual SkISize onISize() SK_OVERRIDE {
-        return make_isize(475, 800);
+        return make_isize(720, 800);
     }
 
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         // This is a GPU-specific GM.
         return kGPUOnly_Flag;
     }
 
     virtual void onOnceBeforeDraw() SK_OVERRIDE {
         SkPath tri;
         tri.moveTo(5.f, 5.f);
@@ skipping 35 matching lines @@
         // vertically/horizontally thin rects that cover pixel centers
         fRects.addToTail(SkRect::MakeLTRB(5.25f, 0.5f, 5.75f, 24.5f));
         fRects.addToTail(SkRect::MakeLTRB(5.5f,  0.5f, 29.5f, 0.75f));
         // vertically/horizontally thin rects that don't cover pixel centers
         fRects.addToTail(SkRect::MakeLTRB(5.55f, 0.5f, 5.75f, 24.5f));
         fRects.addToTail(SkRect::MakeLTRB(5.5f, .05f, 29.5f, .25f));
         // small in x and y
         fRects.addToTail(SkRect::MakeLTRB(5.05f, .55f, 5.45f, .85f));
         // inverted in x and y
         fRects.addToTail(SkRect::MakeLTRB(100.f, 50.5f, 5.f, 0.5f));
-
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkBaseDevice* device = canvas->getTopDevice();
         GrRenderTarget* rt = device->accessRenderTarget();
         if (NULL == rt) {
             return;
         }
         GrContext* context = rt->getContext();
         if (NULL == context) {
@@ skipping 53 matching lines @@
             SkPaint paint;
             canvas->drawPath(*path, paint);
             canvas->translate(path->getBounds().width() + 10.f, 0);
             paint.setAntiAlias(true);
             canvas->drawPath(*path, paint);
             canvas->restore();
 
             y += SkScalarCeilToScalar(path->getBounds().height() + 20.f);
         }
 
-        // Draw rects. We only have specialized effect code for the AA case, so don't do non-AA.
         for (SkTLList<SkRect>::Iter iter(fRects, SkTLList<SkRect>::Iter::kHead_IterStart);
              NULL != iter.get();
              iter.next()) {
 
             SkScalar x = 0;
 
-            GrTestTarget tt;
-            context->getTestTarget(&tt);
-            if (NULL == tt.target()) {
-                SkDEBUGFAIL("Couldn't get Gr test target.");
-                return;
+            for (int et = 0; et < GrConvexPolyEffect::kEdgeTypeCnt; ++et) {
+                GrTestTarget tt;
+                context->getTestTarget(&tt);
+                if (NULL == tt.target()) {
+                    SkDEBUGFAIL("Couldn't get Gr test target.");
+                    return;
+                }
+                SkRect rect = *iter.get();
+                rect.offset(x, y);
+                GrConvexPolyEffect::EdgeType edgeType = (GrConvexPolyEffect::EdgeType) et;
+                SkAutoTUnref<GrEffectRef> effect(GrConvexPolyEffect::Create(edgeType, rect));
+                if (!effect) {
+                    SkDEBUGFAIL("Couldn't create convex poly effect.");
+                    return;
+                }
+
+                GrDrawState* drawState = tt.target()->drawState();
+                drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs));
+                drawState->addCoverageEffect(effect, 1);
+                drawState->setIdentityViewMatrix();
+                drawState->setRenderTarget(rt);
+                drawState->setColor(0xff000000);
+
+                SkPoint verts[4];
+                SkRect bounds = rect;
+                bounds.outset(5.f, 5.f);
+                bounds.toQuad(verts);
+
+                tt.target()->setVertexSourceToArray(verts, 4);
+                tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
+                tt.target()->drawIndexed(kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
+
+                x += SkScalarCeilToScalar(rect.width() + 10.f);
             }
 
-            SkRect rect = *iter.get();
-            rect.offset(x, y);
-            SkAutoTUnref<GrEffectRef> effect(GrConvexPolyEffect::CreateForAAFillRect(rect));
-            if (!effect) {
-                SkDEBUGFAIL("Couldn't create convex poly effect.");
-                return;
-            }
-
-            GrDrawState* drawState = tt.target()->drawState();
-            drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs));
-            drawState->addCoverageEffect(effect, 1);
-            drawState->setIdentityViewMatrix();
-            drawState->setRenderTarget(rt);
-            drawState->setColor(0xff000000);
-
-            SkPoint verts[4];
-            SkRect bounds = rect;
-            bounds.outset(5.f, 5.f);
-            bounds.toQuad(verts);
-
-            tt.target()->setVertexSourceToArray(verts, 4);
-            tt.target()->setIndexSourceToBuffer(context->getQuadIndexBuffer());
-            tt.target()->drawIndexed(kTriangleFan_GrPrimitiveType, 0, 0, 4, 6);
-
-            x += SkScalarCeilToScalar(rect.width() + 10.f);
-
-            // Draw AA rect using normal API for reference
+            // Draw rect without and with AA using normal API for reference
             canvas->save();
             canvas->translate(x, y);
             SkPaint paint;
+            canvas->drawRect(*iter.get(), paint);
+            x += SkScalarCeilToScalar(iter.get()->width() + 10.f);
             paint.setAntiAlias(true);
             canvas->drawRect(*iter.get(), paint);
             canvas->restore();
 
-            y += SkScalarCeilToScalar(rect.height() + 20.f);
+            y += SkScalarCeilToScalar(iter.get()->height() + 20.f);
         }
     }
 
 private:
     SkTLList<SkPath> fPaths;
     SkTLList<SkRect> fRects;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(ConvexPolyEffect); )
 }
 
 #endif