| Index: src/gpu/gl/GrGLPrimitiveProcessor.h
|
| diff --git a/src/gpu/gl/GrGLPrimitiveProcessor.h b/src/gpu/gl/GrGLPrimitiveProcessor.h
|
| index 30b1c178cd28ef045c39ef08c383c5f4bfe47e91..90ee2038f86711761e95dc5f6f24c0bbe5e68b10 100644
|
| --- a/src/gpu/gl/GrGLPrimitiveProcessor.h
|
| +++ b/src/gpu/gl/GrGLPrimitiveProcessor.h
|
| @@ -74,16 +74,7 @@ public:
|
| static SkMatrix GetTransformMatrix(const SkMatrix& localMatrix, const GrCoordTransform&);
|
|
|
| protected:
|
| - /** a helper which can setup vertex, constant, or uniform color depending on inputType.
|
| - * This function will only do the minimum required to emit the correct shader code. If
|
| - * inputType == attribute, then colorAttr must not be NULL. Likewise, if inputType == Uniform
|
| - * then colorUniform must not be NULL.
|
| - */
|
| - void setupColorPassThrough(GrGLGPBuilder* pb,
|
| - GrGPInput inputType,
|
| - const char* inputName,
|
| - const GrPrimitiveProcessor::Attribute* colorAttr,
|
| - UniformHandle* colorUniform);
|
| + void setupUniformColor(GrGLGPBuilder* pb, const char* outputName, UniformHandle* colorUniform);
|
|
|
| const char* uViewM() const { return fViewMatrixName; }
|
|
|
|
|