GPU Gradients

gm/gradients_gpu.cpp

Index: gm/gradients_gpu.cpp
diff --git a/gm/gradientDirtyLaundry.cpp b/gm/gradients_gpu.cpp
similarity index 63%
copy from gm/gradientDirtyLaundry.cpp
copy to gm/gradients_gpu.cpp
index ff6864ad7a7584d2a2609f587502c778e9046c18..0caef6eebd51b840e90d1a975084e6f20b4c0d7d 100644
--- a/gm/gradientDirtyLaundry.cpp
+++ b/gm/gradients_gpu.cpp
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2013 Google Inc.
  *
@@ -17,22 +16,14 @@ struct GradData {
 };
 
 static const SkColor gColors[] = {
-    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK,
-    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK,
-    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK,
-    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK,
-    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK,
-    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK,
-    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK,
-    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, SK_ColorBLACK,
+    SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE,
 };
 
-//static const SkScalar gPos[] = { SK_Scalar1*999/2000, SK_Scalar1*1001/2000 };
-
 static const GradData gGradData[] = {
-    { 40, gColors, NULL },
-    //  { 2, gColors, gPos },
-    //  { 2, gCol2, NULL },
+    { 1, gColors, NULL },
+    { 2, gColors, NULL },
+//    { 3, gColors, NULL },
+    { 4, gColors, NULL },
 };
 
 static SkShader* MakeLinear(const SkPoint pts[2], const GradData& data,
@@ -59,11 +50,37 @@ static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data,
                                          data.fPos, data.fCount, mapper);
 }
 
+static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data,
+                             SkShader::TileMode tm, SkUnitMapper* mapper) {
+    SkPoint center0, center1;
+    center0.set(SkScalarAve(pts[0].fX, pts[1].fX),
+                SkScalarAve(pts[0].fY, pts[1].fY));
+    center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5),
+                SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4));
+    return SkGradientShader::CreateTwoPointRadial(
+        center1, (pts[1].fX - pts[0].fX) / 7,
+        center0, (pts[1].fX - pts[0].fX) / 2,
+        data.fColors, data.fPos, data.fCount, tm, mapper);
+}
+
+static SkShader* Make2Conical(const SkPoint pts[2], const GradData& data,
+                              SkShader::TileMode tm, SkUnitMapper* mapper) {
+    SkPoint center0, center1;
+    SkScalar radius0 = SkScalarDiv(pts[1].fX - pts[0].fX, 10);
+    SkScalar radius1 = SkScalarDiv(pts[1].fX - pts[0].fX, 3);
+    center0.set(pts[0].fX + radius0, pts[0].fY + radius0);
+    center1.set(pts[1].fX - radius1, pts[1].fY - radius1);
+    return SkGradientShader::CreateTwoPointConical(center1, radius1,
+                                                   center0, radius0,
+                                                   data.fColors, data.fPos,
+                                                   data.fCount, tm, mapper);
+}
+
 
 typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data,
                                SkShader::TileMode tm, SkUnitMapper* mapper);
 static const GradMaker gGradMakers[] = {
-    MakeLinear, MakeRadial, MakeSweep,
+    MakeLinear, MakeRadial, MakeSweep, Make2Radial, Make2Conical,
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -75,7 +92,7 @@ public:
     }
 
 protected:
-    SkString onShortName() SK_OVERRIDE { return SkString("gradient_dirty_laundry"); }
+    SkString onShortName() SK_OVERRIDE { return SkString("gradients_gpu"); }
     virtual SkISize onISize() SK_OVERRIDE { return make_isize(640, 615); }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
@@ -88,9 +105,9 @@ protected:
         paint.setAntiAlias(true);
 
         canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
-        for (size_t i = 0; i < SK_ARRAY_COUNT(gGradData); i++) {
+        for (size_t i = 0; i < SK_ARRAY_COUNT(gGradData); ++i) {
             canvas->save();
-            for (size_t j = 0; j < SK_ARRAY_COUNT(gGradMakers); j++) {
+            for (size_t j = 0; j < 1; ++j){ //SK_ARRAY_COUNT(gGradMakers); ++j) {

[bsalomon, 2013/08/13 14:28:37]

Is this intended?

[dierk, 2013/08/13 19:50:17]

Was done for test purposes when modifications were made to the LinearGradient
inherited class but not others. Since changes were pushed into base class I've
switched it back.

On 2013/08/13 14:28:37, bsalomon wrote:

                 SkShader* shader = gGradMakers[j](pts, gGradData[i], tm, NULL);
                 paint.setShader(shader)->unref();
                 canvas->drawRect(r, paint);