API change to allow for NormalSource selection at the user level.

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 "SkLightingShader.h"
@@ skipping 81 matching lines @@
 
         SkMatrix matrix;
         matrix.setRectToRect(bitmapBounds, r, SkMatrix::kFill_ScaleToFit);
 
         const SkMatrix& ctm = canvas->getTotalMatrix();
 
         // TODO: correctly pull out the pure rotation
         SkVector invNormRotation = { ctm[SkMatrix::kMScaleX], ctm[SkMatrix::kMSkewY] };
 
         SkPaint paint;
-        paint.setShader(SkLightingShader::Make(fDiffuse, fNormalMaps[mapType], fLights,
-                                               invNormRotation, &matrix, &matrix));
+        auto normalSource = SkLightingShader::NormalMapSource::Make(fNormalMaps[mapType],
+                                                                    invNormRotation, &matrix);
+        paint.setShader(SkLightingShader::Make(fDiffuse, fLights, &matrix, normalSource));

[egdaniel, 2016/06/16 13:15:08]

should this be a move here of normal source?

[dvonbeck, 2016/06/16 23:21:56]

Done.

 
         canvas->drawRect(r, paint);
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkMatrix m;
         SkRect r;
 
         {
             r = SkRect::MakeWH(SkIntToScalar(kTexSize), SkIntToScalar(kTexSize));
@@ skipping 53 matching lines @@
 
     sk_sp<SkLights> fLights;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new LightingShaderGM;)
 }