Added API for Bevel NormalSource.

gm/lightingshader.cpp

 /*
  * Copyright 2015 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"
 
 #include "SkBitmapProcShader.h"
@@ skipping 94 matching lines @@
         sk_sp<SkShader> normalMap = SkMakeBitmapShader(fNormalMaps[mapType],
                 SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix, nullptr);
         sk_sp<SkNormalSource> normalSource = SkNormalSource::MakeFromNormalMap(std::move(normalMap),
                                                                                ctm);
         paint.setShader(SkLightingShader::Make(std::move(diffuseShader), std::move(normalSource),
                                                fLights));
 
         canvas->drawRect(r, paint);
     }
 
+    void drawBevelRect(SkCanvas* canvas, const SkRect& r) {
+
+        SkRect bitmapBounds = SkRect::MakeIWH(fDiffuse.width(), fDiffuse.height());
+
+        SkMatrix matrix;
+        matrix.setRectToRect(bitmapBounds, r, SkMatrix::kFill_ScaleToFit);
+
+        SkPaint paint;
+        auto diffuseShader = SkBitmapProcShader::MakeBitmapShader(fDiffuse,
+                SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, &matrix);
+        auto normalSource = SkNormalSource::MakeBevel(SkNormalSource::BevelType::kLinear,
+                                                      0.15f * SkIntToScalar(kTexSize),
+                                                      0.2f * SkIntToScalar(kTexSize));
+        paint.setShader(SkLightingShader::Make(std::move(diffuseShader), std::move(normalSource),
+                                               fLights));
+
+        canvas->drawRect(r, paint);
+    }
+
     void onDraw(SkCanvas* canvas) override {
         SkMatrix m;
         SkRect r;
 
         {
             r = SkRect::MakeWH(SkIntToScalar(kTexSize), SkIntToScalar(kTexSize));
             this->drawRect(canvas, r, kHemi_NormalMap);
 
             canvas->save();
             m.setRotate(45.0f, r.centerX(), r.centerY());
             m.postTranslate(kGMSize/2.0f - kTexSize/2.0f, 0.0f);
             canvas->setMatrix(m);
             this->drawRect(canvas, r, kHemi_NormalMap);
             canvas->restore();
         }
 
         {
             r.offset(kGMSize - kTexSize, 0);
             this->drawRect(canvas, r, kFrustum_NormalMap);
 
             canvas->save();
             m.setRotate(45.0f, r.centerX(), r.centerY());
             m.postTranslate(0.0f, kGMSize/2.0f - kTexSize/2.0f);
             canvas->setMatrix(m);
-            this->drawRect(canvas, r, kFrustum_NormalMap);
+            this->drawBevelRect(canvas, r);

[egdaniel, 2016/07/25 15:48:00]

do we really want to change this GM from using normalMaps? With the change the
GM is going to change but then will change again slowly as we start fixing
beveling and the GeomProcs. Seems like we should leave this GM as is and make a
new one to test beveling where we can adjust all the various bevel params in the
one GM.

[dvonbeck, 2016/07/25 20:37:13]

Agreed. Done.

             canvas->restore();
         }
 
         {
             r.offset(0, kGMSize - kTexSize);
             this->drawRect(canvas, r, kTetra_NormalMap);
 
             canvas->save();
             m.setRotate(45.0f, r.centerX(), r.centerY());
             m.postTranslate(-kGMSize/2.0f + kTexSize/2.0f, 0.0f);
@@ skipping 24 matching lines @@
 
     sk_sp<SkLights> fLights;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new LightingShaderGM;)
 }