Checkpoint in mving texture matrices out of GrGLProgram and into GrGLEffect.

Checkpoint in moving texture matrices out of GrGLProgram and into GrGLEffect.
Committed: https://code.google.com/p/skia/source/detail?r=6233

[bsalomon, 2012-10-31 20:28:21]

Once all effects that require matrices are using GrGLEffectMatrix there is a lot
more stuff that can go away.

[robertphillips, 2012-11-01 13:03:25]

Ouch - but LGTM. Some minor nits & questions.

https://codereview.appspot.com/6818064/diff/1002/src/effects/SkColorMatrixFil...
File src/effects/SkColorMatrixFilter.cpp (right):

https://codereview.appspot.com/6818064/diff/1002/src/effects/SkColorMatrixFil...
src/effects/SkColorMatrixFilter.cpp:352: ,
fVectorHandle(GrGLUniformManager::kInvalidUniformHandle) {
doesn't it just not use texture coordinates at all?

https://codereview.appspot.com/6818064/diff/1002/src/effects/gradients/SkTwoP...
File src/effects/gradients/SkTwoPointRadialGradient.cpp (right):

https://codereview.appspot.com/6818064/diff/1002/src/effects/gradients/SkTwoP...
src/effects/gradients/SkTwoPointRadialGradient.cpp:653: if (static_cast<const
GrRadial2Gradient&>(*s.getEffect()).isDegenerate()) {
I don't know if it is worth it but, what do you think about making an enum for
the degenerate flag here and in GrGLConical2Gradient?

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix.cpp
File src/gpu/gl/GrGLEffectMatrix.cpp (right):

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix....
src/gpu/gl/GrGLEffectMatrix.cpp:75: fUni =
builder->addUniform(GrGLShaderBuilder::kVertex_ShaderType,
indent?

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix....
src/gpu/gl/GrGLEffectMatrix.cpp:138: GrSLType varyingType =
this->emitCode(builder,
indent?

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix....
src/gpu/gl/GrGLEffectMatrix.cpp:145: 
I see "StageCoord" repeated in a couple of places. Does it make sense to define
it somewhere to ensure uniformity?

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix....
src/gpu/gl/GrGLEffectMatrix.cpp:185: uniformManager.set2f(fUni,
Why not use tx & ty here?

[bsalomon, 2012-11-01 13:41:33]

https://codereview.appspot.com/6818064/diff/1002/src/effects/SkColorMatrixFil...
File src/effects/SkColorMatrixFilter.cpp (right):

https://codereview.appspot.com/6818064/diff/1002/src/effects/SkColorMatrixFil...
src/effects/SkColorMatrixFilter.cpp:352: ,
fVectorHandle(GrGLUniformManager::kInvalidUniformHandle) {
On 2012/11/01 13:03:25, robertphillips wrote:
> doesn't it just not use texture coordinates at all?

Oh you're right... I was thinking of the table color filter that uses incoming
colors to compute coords... this guy doesn't use a texture at all.

Fixed.

https://codereview.appspot.com/6818064/diff/1002/src/effects/gradients/SkTwoP...
File src/effects/gradients/SkTwoPointRadialGradient.cpp (right):

https://codereview.appspot.com/6818064/diff/1002/src/effects/gradients/SkTwoP...
src/effects/gradients/SkTwoPointRadialGradient.cpp:653: if (static_cast<const
GrRadial2Gradient&>(*s.getEffect()).isDegenerate()) {
On 2012/11/01 13:03:25, robertphillips wrote:
> I don't know if it is worth it but, what do you think about making an enum for
> the degenerate flag here and in GrGLConical2Gradient?

Done:

enum {
    kIsDegenerate = 1 << kMatrixKeyBitCnt,
};

EffectKey key = GenMatrixKey(s);
if (static_cast<const GrRadial2Gradient&>(*s.getEffect()).isDegenerate()) {
   key |= kIsDegenerate;
}
return key;

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix.cpp
File src/gpu/gl/GrGLEffectMatrix.cpp (right):

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix....
src/gpu/gl/GrGLEffectMatrix.cpp:75: fUni =
builder->addUniform(GrGLShaderBuilder::kVertex_ShaderType,
On 2012/11/01 13:03:25, robertphillips wrote:
> indent?

Done.

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix....
src/gpu/gl/GrGLEffectMatrix.cpp:138: GrSLType varyingType =
this->emitCode(builder,
On 2012/11/01 13:03:25, robertphillips wrote:
> indent?

Done.

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix....
src/gpu/gl/GrGLEffectMatrix.cpp:145: 
On 2012/11/01 13:03:25, robertphillips wrote:
> I see "StageCoord" repeated in a couple of places. Does it make sense to
define
> it somewhere to ensure uniformity?

Now that I look at it I actually think it was wrong to name them the same thing.
One is a varying and the other is the computed from the varying in FS by doing
perspective division. The builder does some appending that makes the final names
unique, but still. I renamed the latter "coords2D"

https://codereview.appspot.com/6818064/diff/1002/src/gpu/gl/GrGLEffectMatrix....
src/gpu/gl/GrGLEffectMatrix.cpp:185: uniformManager.set2f(fUni,
On 2012/11/01 13:03:25, robertphillips wrote:
> Why not use tx & ty here?
Done (duh)