Add normal map sample

Add normal map sample

This adds an example of an SkShader that does normal
mapping. It has a single directional light and an
ambient light.

Committed: https://skia.googlesource.com/skia/+/8e0da72ba890de395c9946ec6639c9e1e7b16027

Committed: https://skia.googlesource.com/skia/+/d17a32966afb2f7fdebfb58d37fa1b2d3e2d474b

[jvanverth1, 2015-07-08 15:52:58]

jvanverth@google.com changed reviewers:
+ bsalomon@google.com, reed@google.com, robertphillips@google.com

[robertphillips, 2015-07-08 16:15:15]

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
File samplecode/SampleLighting.cpp (right):

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:98: 
one line ?
Is this right ?

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:110: void emitCode(GrGLFPBuilder* builder,
tab these over ?

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:114: const TransformedCoordsArray& coords,
override ?

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:131: fAmbientColorUni =
builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
tabs ?

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:136:
fpb->appendTextureLookupAndModulate(inputColor,
tabs ?

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:206: private:
??

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:304: public:
Can this be an AutoTUnref ?

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:352: 
Color animation ?

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:358: 
Can we just store it as a LightingShader ?

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:379: 
rm this ?

[jvanverth1, 2015-07-08 19:58:07]

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
File samplecode/SampleLighting.cpp (right):

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:98: 
On 2015/07/08 16:15:14, robertphillips wrote:
> one line ?
> Is this right ?

I think it's okay, but added the full GenKey() code for extensibility.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:110: void emitCode(GrGLFPBuilder* builder,
On 2015/07/08 16:15:14, robertphillips wrote:
> tab these over ?

Done.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:114: const TransformedCoordsArray& coords,
On 2015/07/08 16:15:14, robertphillips wrote:
> override ?

Done.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:131: fAmbientColorUni =
builder->addUniform(GrGLProgramBuilder::kFragment_Visibility,
On 2015/07/08 16:15:14, robertphillips wrote:
> tabs ?

Done.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:136:
fpb->appendTextureLookupAndModulate(inputColor,
On 2015/07/08 16:15:14, robertphillips wrote:
> tabs ?

Done.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:206: private:
On 2015/07/08 16:15:14, robertphillips wrote:
> ??

Done.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:304: public:
On 2015/07/08 16:15:14, robertphillips wrote:
> Can this be an AutoTUnref ?

Done, I think.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:352: 
On 2015/07/08 16:15:14, robertphillips wrote:
> Color animation ?

Done.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:358: 
On 2015/07/08 16:15:14, robertphillips wrote:
> Can we just store it as a LightingShader ?

Done.

https://codereview.chromium.org/1212813009/diff/40001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:379: 
On 2015/07/08 16:15:14, robertphillips wrote:
> rm this ?

Done.

[robertphillips, 2015-07-08 20:39:25]

lgtm + nits

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
File samplecode/SampleLighting.cpp (right):

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:25: struct SkVector3 {
fX, fY, fZ ?

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:214: static void GenKey(const GrProcessor& proc,
const GrGLSLCaps&,
tab over ?

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:233: 
extra \n ?

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:254: return fDeviceTransform ==
lightingFP.fDeviceTransform &&
line up?

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:401: light.fColor = SkColorSetRGB(0xff, 0xff,
(fColorFactor >> 1) & 0xff);
.785 -> SK_ScalarPI/4 ?

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:411: 
r = SkRect::MakeWH(fDiffuseBitmap.width(), fDiffuseBitmap.height()) ?

[jvanverth1, 2015-07-08 20:54:12]

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
File samplecode/SampleLighting.cpp (right):

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:25: struct SkVector3 {
On 2015/07/08 20:39:24, robertphillips wrote:
> fX, fY, fZ ?

Done.

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:214: static void GenKey(const GrProcessor& proc,
const GrGLSLCaps&,
On 2015/07/08 20:39:24, robertphillips wrote:
> tab over ?

Done.

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:233: 
On 2015/07/08 20:39:24, robertphillips wrote:
> extra \n ?

Done.

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:254: return fDeviceTransform ==
lightingFP.fDeviceTransform &&
On 2015/07/08 20:39:24, robertphillips wrote:
> line up?

Done.

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:401: light.fColor = SkColorSetRGB(0xff, 0xff,
(fColorFactor >> 1) & 0xff);
On 2015/07/08 20:39:24, robertphillips wrote:
> .785 -> SK_ScalarPI/4 ?

Done.

https://codereview.chromium.org/1212813009/diff/60001/samplecode/SampleLighti...
samplecode/SampleLighting.cpp:411: 
On 2015/07/08 20:39:24, robertphillips wrote:
> r = SkRect::MakeWH(fDiffuseBitmap.width(), fDiffuseBitmap.height()) ?

Done.

[jvanverth1, 2015-07-08 20:54:16]

The CQ bit was checked by jvanverth@google.com

[jvanverth1, 2015-07-08 20:54:16]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/1212813009/#ps80001
(title: "Address nits")

[commit-bot: I haz the power, 2015-07-08 20:54:36]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1212813009/80001

[commit-bot: I haz the power, 2015-07-08 20:55:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-07-08 20:55:26]

Try jobs failed on following builders:
  Build-Ubuntu-Clang-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-Clang-x...)
  Build-Ubuntu-GCC-Arm7-Debug-Android-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Arm...)
  Build-Ubuntu-GCC-Mips-Debug-Android-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-Mip...)

(exceeded global retry quota)

[jvanverth1, 2015-07-08 21:10:46]

The CQ bit was checked by jvanverth@google.com

[jvanverth1, 2015-07-08 21:10:47]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/1212813009/#ps100001
(title: "Fix merge issues")

[commit-bot: I haz the power, 2015-07-08 21:11:03]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1212813009/100001

[commit-bot: I haz the power, 2015-07-08 21:21:51]

Committed patchset #6 (id:100001) as
https://skia.googlesource.com/skia/+/8e0da72ba890de395c9946ec6639c9e1e7b16027

[robertphillips, 2015-07-08 21:45:51]

A revert of this CL (patchset #6 id:100001) has been created in
https://codereview.chromium.org/1230603002/ by robertphillips@google.com.

The reason for reverting is: Compilation failures:

../../../../../samplecode/SampleLighting.cpp:13:18: fatal error: SkGr.h: No such
file or directory.

[jvanverth1, 2015-07-09 15:37:05]

The CQ bit was checked by jvanverth@google.com

[jvanverth1, 2015-07-09 15:37:06]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/1212813009/#ps250001
(title: "Don't compile SampleLighting.cpp on CrOS")

[commit-bot: I haz the power, 2015-07-09 15:37:23]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1212813009/250001

[commit-bot: I haz the power, 2015-07-09 16:04:21]

Committed patchset #14 (id:250001) as
https://skia.googlesource.com/skia/+/d17a32966afb2f7fdebfb58d37fa1b2d3e2d474b