Added mangleString member and onBefore*, onAfter* functions to GrGLFragmentShaderBuilder

Added mangleString member and  onBefore*, onAfter* functions to GrGLFragmentShaderBuilder

BUILDS! Added mangleString, onBefore, and onAfterChildProcEmitCode() to GrGLFragmentShaderBuilder.cpp

BUG=skia:4182
Committed: https://skia.googlesource.com/skia/+/7ef45a1aeb2c764d41838323f5bcff149c5de756

[wangyix, 2015-08-12 16:38:47]

wangyix@google.com changed reviewers:
+ bsalomon@google.com, egdaniel@google.com, joshualitt@google.com

[wangyix, 2015-08-12 16:38:47]

Two members were added to GrGLFragmentShaderBuilder: fSubstageIndices and
fMangleString.  fSubstageIndices is a stack of indices that keeps track of where
in a proc's tree we are, and these indices directly determine the mangle string
(it just appends the indices one after the other. For example, a manglestring of
"_c2_c1_c4" means we're on the 4th child of the 1st child of the 2nd child of
the root proc).  Functions onBeforeChildProcEmitCode and
onAfterChildProcEmitCode will update this stack and the mangle string.

[joshualitt, 2015-08-12 17:14:53]

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
File src/gpu/gl/builders/GrGLFragmentShaderBuilder.h (right):

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:61: if (fSubstageIndices.count()
> 1)
Braces

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:62: return
fSubstageIndices[fSubstageIndices.count() - 2];
Could you put a comment here for the '- 2'?
ie, the index of the child proc which is currently emitting code, or something
similar

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:70: int childNumber =
getChildNumberThisLevel();
this->

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:71: if (childNumber >= 0)
braces

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:85: SkString fMangleString;
Please put an explanation of the what the mangle string looks like here

[bsalomon, 2015-08-12 17:28:05]

I defer to Josh on this one.

[wangyix, 2015-08-12 18:00:33]

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
File src/gpu/gl/builders/GrGLFragmentShaderBuilder.h (right):

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:61: if (fSubstageIndices.count()
> 1)
On 2015/08/12 17:14:53, joshualitt wrote:
> Braces

Done.

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:62: return
fSubstageIndices[fSubstageIndices.count() - 2];
On 2015/08/12 17:14:53, joshualitt wrote:
> Could you put a comment here for the '- 2'?
> ie, the index of the child proc which is currently emitting code, or something
> similar

Done.

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:70: int childNumber =
getChildNumberThisLevel();
On 2015/08/12 17:14:53, joshualitt wrote:
> this->

Done.

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:71: if (childNumber >= 0)
On 2015/08/12 17:14:53, joshualitt wrote:
> braces

Done.

https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:85: SkString fMangleString;
On 2015/08/12 17:14:53, joshualitt wrote:
> Please put an explanation of the what the mangle string looks like here

Done.

[joshualitt, 2015-08-12 18:45:18]

On 2015/08/12 18:00:33, wangyix wrote:
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> File src/gpu/gl/builders/GrGLFragmentShaderBuilder.h (right):
> 
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:61: if
(fSubstageIndices.count()
> > 1)
> On 2015/08/12 17:14:53, joshualitt wrote:
> > Braces
> 
> Done.
> 
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:62: return
> fSubstageIndices[fSubstageIndices.count() - 2];
> On 2015/08/12 17:14:53, joshualitt wrote:
> > Could you put a comment here for the '- 2'?
> > ie, the index of the child proc which is currently emitting code, or
something
> > similar
> 
> Done.
> 
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:70: int childNumber =
> getChildNumberThisLevel();
> On 2015/08/12 17:14:53, joshualitt wrote:
> > this->
> 
> Done.
> 
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:71: if (childNumber >= 0)
> On 2015/08/12 17:14:53, joshualitt wrote:
> > braces
> 
> Done.
> 
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:85: SkString fMangleString;
> On 2015/08/12 17:14:53, joshualitt wrote:
> > Please put an explanation of the what the mangle string looks like here
> 
> Done.

lgtm

[wangyix, 2015-08-12 20:47:45]

The CQ bit was checked by wangyix@google.com

[commit-bot: I haz the power, 2015-08-12 20:48:00]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1288723002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1288723002/20001

[commit-bot: I haz the power, 2015-08-12 20:49:03]

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

[commit-bot: I haz the power, 2015-08-12 20:49:04]

Try jobs failed on following builders:
  skia_presubmit-Trybot on client.skia.fyi (JOB_FAILED,
http://build.chromium.org/p/client.skia.fyi/builders/skia_presubmit-Trybot/bu...)

[wangyix, 2015-08-12 20:57:54]

On 2015/08/12 18:45:18, joshualitt wrote:
> On 2015/08/12 18:00:33, wangyix wrote:
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > File src/gpu/gl/builders/GrGLFragmentShaderBuilder.h (right):
> > 
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:61: if
> (fSubstageIndices.count()
> > > 1)
> > On 2015/08/12 17:14:53, joshualitt wrote:
> > > Braces
> > 
> > Done.
> > 
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:62: return
> > fSubstageIndices[fSubstageIndices.count() - 2];
> > On 2015/08/12 17:14:53, joshualitt wrote:
> > > Could you put a comment here for the '- 2'?
> > > ie, the index of the child proc which is currently emitting code, or
> something
> > > similar
> > 
> > Done.
> > 
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:70: int childNumber =
> > getChildNumberThisLevel();
> > On 2015/08/12 17:14:53, joshualitt wrote:
> > > this->
> > 
> > Done.
> > 
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:71: if (childNumber >= 0)
> > On 2015/08/12 17:14:53, joshualitt wrote:
> > > braces
> > 
> > Done.
> > 
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:85: SkString fMangleString;
> > On 2015/08/12 17:14:53, joshualitt wrote:
> > > Please put an explanation of the what the mangle string looks like here
> > 
> > Done.
> 
> lgtm

Looks like I need Brian's LGTM again.

[bsalomon, 2015-08-13 13:41:37]

On 2015/08/12 20:57:54, wangyix wrote:
> On 2015/08/12 18:45:18, joshualitt wrote:
> > On 2015/08/12 18:00:33, wangyix wrote:
> > >
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > > File src/gpu/gl/builders/GrGLFragmentShaderBuilder.h (right):
> > > 
> > >
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:61: if
> > (fSubstageIndices.count()
> > > > 1)
> > > On 2015/08/12 17:14:53, joshualitt wrote:
> > > > Braces
> > > 
> > > Done.
> > > 
> > >
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:62: return
> > > fSubstageIndices[fSubstageIndices.count() - 2];
> > > On 2015/08/12 17:14:53, joshualitt wrote:
> > > > Could you put a comment here for the '- 2'?
> > > > ie, the index of the child proc which is currently emitting code, or
> > something
> > > > similar
> > > 
> > > Done.
> > > 
> > >
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:70: int childNumber =
> > > getChildNumberThisLevel();
> > > On 2015/08/12 17:14:53, joshualitt wrote:
> > > > this->
> > > 
> > > Done.
> > > 
> > >
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:71: if (childNumber >= 0)
> > > On 2015/08/12 17:14:53, joshualitt wrote:
> > > > braces
> > > 
> > > Done.
> > > 
> > >
> >
>
https://codereview.chromium.org/1288723002/diff/1/src/gpu/gl/builders/GrGLFra...
> > > src/gpu/gl/builders/GrGLFragmentShaderBuilder.h:85: SkString
fMangleString;
> > > On 2015/08/12 17:14:53, joshualitt wrote:
> > > > Please put an explanation of the what the mangle string looks like here
> > > 
> > > Done.
> > 
> > lgtm
> 
> Looks like I need Brian's LGTM again.

lgtm

[wangyix, 2015-08-13 13:44:27]

The CQ bit was checked by wangyix@google.com

[wangyix, 2015-08-13 13:44:27]

The patchset sent to the CQ was uploaded after l-g-t-m from
joshualitt@google.com
Link to the patchset: https://codereview.chromium.org/1288723002/#ps40001
(title: "Added a missing brace")

[commit-bot: I haz the power, 2015-08-13 13:44:30]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1288723002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1288723002/40001

[commit-bot: I haz the power, 2015-08-13 13:51:38]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/7ef45a1aeb2c764d41838323f5bcff149c5de756