Allow GrEffects with multiple textures.

Allow GrEffects with multiple textures.

It will work as long as the total number of textures sis less than GrDrawState::kNumStages. That will be fixed in a follow up CL.
Committed: https://code.google.com/p/skia/source/detail?r=7023

[bsalomon, 2013-01-04 14:45:51]

https://codereview.appspot.com/7040052/diff/4001/src/gpu/gl/GrGLProgram.cpp
File src/gpu/gl/GrGLProgram.cpp (left):

https://codereview.appspot.com/7040052/diff/4001/src/gpu/gl/GrGLProgram.cpp#o...
src/gpu/gl/GrGLProgram.cpp:35: inline const char* float_vector_type_str(int
count) {
These functions aren't called anywhere

[robertphillips, 2013-01-04 15:10:12]

LGTM + nits

https://codereview.appspot.com/7040052/diff/4001/include/gpu/GrEffect.h
File include/gpu/GrEffect.h (right):

https://codereview.appspot.com/7040052/diff/4001/include/gpu/GrEffect.h#newco...
include/gpu/GrEffect.h:90: dimensions */
GrTexture&?

https://codereview.appspot.com/7040052/diff/4001/src/effects/SkBlendImageFilt...
File src/effects/SkBlendImageFilter.cpp (right):

https://codereview.appspot.com/7040052/diff/4001/src/effects/SkBlendImageFilt...
src/effects/SkBlendImageFilter.cpp:134: private:
Shouldn't INHERITED go last?

https://codereview.appspot.com/7040052/diff/4001/src/effects/SkBlendImageFilt...
src/effects/SkBlendImageFilter.cpp:157: private:
INHERITED at end?

[bsalomon, 2013-01-04 15:31:17]

https://codereview.appspot.com/7040052/diff/4001/include/gpu/GrEffect.h
File include/gpu/GrEffect.h (right):

https://codereview.appspot.com/7040052/diff/4001/include/gpu/GrEffect.h#newco...
include/gpu/GrEffect.h:90: dimensions */
On 2013/01/04 15:10:13, robertphillips wrote:
> GrTexture&?

Hmm... we don't usually pass ref counted objects as references.

https://codereview.appspot.com/7040052/diff/4001/src/effects/SkBlendImageFilt...
File src/effects/SkBlendImageFilter.cpp (right):

https://codereview.appspot.com/7040052/diff/4001/src/effects/SkBlendImageFilt...
src/effects/SkBlendImageFilter.cpp:134: private:
On 2013/01/04 15:10:13, robertphillips wrote:
> Shouldn't INHERITED go last?

Done.

https://codereview.appspot.com/7040052/diff/4001/src/effects/SkBlendImageFilt...
src/effects/SkBlendImageFilter.cpp:157: private:
On 2013/01/04 15:10:13, robertphillips wrote:
> INHERITED at end?

Done.

[Stephen White, 2013-01-04 15:33:06]

I'd like to take a look at this before it lands (will try to do so before noon.)

[bsalomon, 2013-01-04 15:33:37]

On 2013/01/04 15:33:06, Stephen White wrote:
> I'd like to take a look at this before it lands (will try to do so before
noon.)

No rush...

[Stephen White, 2013-01-04 17:11:38]

LGTM

https://codereview.appspot.com/7040052/diff/5001/src/effects/SkBlendImageFilt...
File src/effects/SkBlendImageFilter.cpp (right):

https://codereview.appspot.com/7040052/diff/5001/src/effects/SkBlendImageFilt...
src/effects/SkBlendImageFilter.cpp:312:
GrEffect::MakeDivByTextureWHMatrix(fgTex),
I wonder if we should have a flavour of GrGLEffectMatrix::setData() that takes
only the texture and stage, and does the MakeDivByTextureWHMatrix() and
getCoordChangeMatrix() calls itself?  Just a thought.  Similarly for GenKey
(below).

[bsalomon, 2013-01-04 18:14:53]

https://codereview.appspot.com/7040052/diff/5001/src/effects/SkBlendImageFilt...
File src/effects/SkBlendImageFilter.cpp (right):

https://codereview.appspot.com/7040052/diff/5001/src/effects/SkBlendImageFilt...
src/effects/SkBlendImageFilter.cpp:312:
GrEffect::MakeDivByTextureWHMatrix(fgTex),
On 2013/01/04 17:11:38, Stephen White wrote:
> I wonder if we should have a flavour of GrGLEffectMatrix::setData() that takes
> only the texture and stage, and does the MakeDivByTextureWHMatrix() and
> getCoordChangeMatrix() calls itself?  Just a thought.  Similarly for GenKey
> (below).

Not a bad idea... I'll consider doing it next time I mess with the code.