VariableVisibility -> ShaderType

[bsalomon, 2012-07-11 13:36:43]

I want to move the generation of the final shader strings into 
GrGLShaderBuilder (as part of uniform manager change). I wanted a ShaderType
enum for this purpose and thought it should then also encompass the variable
lifetime rather than having two very similar enums.

I threw in some other minor changes like promotion to 100 col lines.

[TomH, 2012-07-11 14:32:31]

Everything but the last is a nit.

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLProgram.cpp
File src/gpu/gl/GrGLProgram.cpp (right):

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLProgram.cpp#ne...
src/gpu/gl/GrGLProgram.cpp:1222:
segments->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
If you're fixing up formatting, why not outdent this properly and delete the
above commented-out line?

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLProgram.cpp#ne...
src/gpu/gl/GrGLProgram.cpp:1277:
segments->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
Outdentagain.

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLShaderBuilder.cpp
File src/gpu/gl/GrGLShaderBuilder.cpp (left):

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLShaderBuilder....
src/gpu/gl/GrGLShaderBuilder.cpp:11: namespace {
Why have we abandoned the namespace?

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLShaderBuilder.h
File src/gpu/gl/GrGLShaderBuilder.h (right):

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLShaderBuilder....
src/gpu/gl/GrGLShaderBuilder.h:92: void getShader(ShaderType, SkString*);
Not implemented yet?

[bsalomon, 2012-07-11 14:52:15]

All comments addressed in patch 2.

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLProgram.cpp
File src/gpu/gl/GrGLProgram.cpp (right):

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLProgram.cpp#ne...
src/gpu/gl/GrGLProgram.cpp:1222:
segments->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
On 2012/07/11 14:32:31, TomH wrote:
> If you're fixing up formatting, why not outdent this properly and delete the
> above commented-out line?

Done.

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLProgram.cpp#ne...
src/gpu/gl/GrGLProgram.cpp:1277:
segments->addUniform(GrGLShaderBuilder::kFragment_ShaderType,
On 2012/07/11 14:32:31, TomH wrote:
> Outdentagain.

Done.

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLShaderBuilder.cpp
File src/gpu/gl/GrGLShaderBuilder.cpp (left):

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLShaderBuilder....
src/gpu/gl/GrGLShaderBuilder.cpp:11: namespace {
On 2012/07/11 14:32:31, TomH wrote:
> Why have we abandoned the namespace?

It's redundant with the "static"s.

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLShaderBuilder.h
File src/gpu/gl/GrGLShaderBuilder.h (right):

http://codereview.appspot.com/6344103/diff/2001/src/gpu/gl/GrGLShaderBuilder....
src/gpu/gl/GrGLShaderBuilder.h:92: void getShader(ShaderType, SkString*);
On 2012/07/11 14:32:31, TomH wrote:
> Not implemented yet?

Oops meant to delete this. Will add back in a later CL.

[TomH, 2012-07-11 14:59:00]

LGTM

http://codereview.appspot.com/6344103/diff/3007/src/gpu/gl/GrGLShaderBuilder.h
File src/gpu/gl/GrGLShaderBuilder.h (right):

http://codereview.appspot.com/6344103/diff/3007/src/gpu/gl/GrGLShaderBuilder....
src/gpu/gl/GrGLShaderBuilder.h:18: Containts all the incremental state of a
shader as it is being built,as well as helpers to
typo: t

http://codereview.appspot.com/6344103/diff/3007/src/gpu/gl/GrGLShaderBuilder....
src/gpu/gl/GrGLShaderBuilder.h:64: shader uniforms are not supported at this
time.
Nice.

[bsalomon, 2012-07-11 19:47:12]

Closed with r4534