Some GrGLShaderBuilder cleanup

[bsalomon, 2012-08-28 15:36:50]

This was partly an exercise in making myself understand how the current code
around texture lookups works. However, it has the benefit of making some public
members of the GrGLShaderBuilder private and I think it will make it easier to
force all stages through emitCustomTextureLookup() and to use GrTextureAccess.

[robertphillips, 2012-08-28 15:52:31]

LGTM

https://codereview.appspot.com/6500043/diff/21/src/gpu/effects/GrTextureDomai...
File src/gpu/effects/GrTextureDomainEffect.cpp (right):

https://codereview.appspot.com/6500043/diff/21/src/gpu/effects/GrTextureDomai...
src/gpu/effects/GrTextureDomainEffect.cpp:52: const char* samplerName) {
It seems like we should either remove coordVar or pass it to
emitTextureLookupAndModulate

https://codereview.appspot.com/6500043/diff/21/src/gpu/gl/GrGLProgram.cpp
File src/gpu/gl/GrGLProgram.cpp (right):

https://codereview.appspot.com/6500043/diff/21/src/gpu/gl/GrGLProgram.cpp#new...
src/gpu/gl/GrGLProgram.cpp:1034: 
Should this comment be "... after calling builder->setupTextureAccess"?
texCoordVaryingType is now local to this method.

https://codereview.appspot.com/6500043/diff/21/src/gpu/gl/GrGLShaderBuilder.h
File src/gpu/gl/GrGLShaderBuilder.h (right):

https://codereview.appspot.com/6500043/diff/21/src/gpu/gl/GrGLShaderBuilder.h...
src/gpu/gl/GrGLShaderBuilder.h:51: kVec2f or kVec3.f */
.f -> f

[bsalomon, 2012-08-28 19:09:07]

Committed as r5322.

https://codereview.appspot.com/6500043/diff/21/src/gpu/effects/GrTextureDomai...
File src/gpu/effects/GrTextureDomainEffect.cpp (right):

https://codereview.appspot.com/6500043/diff/21/src/gpu/effects/GrTextureDomai...
src/gpu/effects/GrTextureDomainEffect.cpp:52: const char* samplerName) {
On 2012/08/28 15:52:32, robertphillips wrote:
> It seems like we should either remove coordVar or pass it to
> emitTextureLookupAndModulate

Done (removed)

https://codereview.appspot.com/6500043/diff/21/src/gpu/gl/GrGLProgram.cpp
File src/gpu/gl/GrGLProgram.cpp (right):

https://codereview.appspot.com/6500043/diff/21/src/gpu/gl/GrGLProgram.cpp#new...
src/gpu/gl/GrGLProgram.cpp:1034: 
On 2012/08/28 15:52:32, robertphillips wrote:
> Should this comment be "... after calling builder->setupTextureAccess"?
> texCoordVaryingType is now local to this method.

Yes, done (comment referred to an earlier version).

https://codereview.appspot.com/6500043/diff/21/src/gpu/gl/GrGLShaderBuilder.h
File src/gpu/gl/GrGLShaderBuilder.h (right):

https://codereview.appspot.com/6500043/diff/21/src/gpu/gl/GrGLShaderBuilder.h...
src/gpu/gl/GrGLShaderBuilder.h:51: kVec2f or kVec3.f */
On 2012/08/28 15:52:32, robertphillips wrote:
> .f -> f

Done.