| Index: src/gpu/glsl/GrGLSLGeometryProcessor.h
|
| diff --git a/src/gpu/glsl/GrGLSLGeometryProcessor.h b/src/gpu/glsl/GrGLSLGeometryProcessor.h
|
| index 4c586a790004a6f4927f0a611ce6359b65a25f42..84a8f8b9636caf9b66f34172762703b5ea878d6f 100644
|
| --- a/src/gpu/glsl/GrGLSLGeometryProcessor.h
|
| +++ b/src/gpu/glsl/GrGLSLGeometryProcessor.h
|
| @@ -42,20 +42,21 @@ public:
|
|
|
| protected:
|
| // Emit a uniform matrix for each coord transform.
|
| - void emitTransforms(GrGLSLGPBuilder* gp,
|
| - GrGLSLVertexBuilder* vb,
|
| + void emitTransforms(GrGLSLVertexBuilder* vb,
|
| GrGLSLVaryingHandler* varyingHandler,
|
| + GrGLSLUniformHandler* uniformHandler,
|
| const GrShaderVar& posVar,
|
| const char* localCoords,
|
| const TransformsIn& tin,
|
| TransformsOut* tout) {
|
| - this->emitTransforms(gp, vb, varyingHandler, posVar, localCoords, SkMatrix::I(), tin, tout);
|
| + this->emitTransforms(vb, varyingHandler, uniformHandler,
|
| + posVar, localCoords, SkMatrix::I(), tin, tout);
|
| }
|
|
|
| // Emit pre-transformed coords as a vertex attribute per coord-transform.
|
| - void emitTransforms(GrGLSLGPBuilder*,
|
| - GrGLSLVertexBuilder*,
|
| + void emitTransforms(GrGLSLVertexBuilder*,
|
| GrGLSLVaryingHandler*,
|
| + GrGLSLUniformHandler*,
|
| const GrShaderVar& posVar,
|
| const char* localCoords,
|
| const SkMatrix& localMatrix,
|
| @@ -63,8 +64,7 @@ protected:
|
| TransformsOut*);
|
|
|
| // caller has emitted transforms via attributes
|
| - void emitTransforms(GrGLSLGPBuilder*,
|
| - GrGLSLVertexBuilder*,
|
| + void emitTransforms(GrGLSLVertexBuilder*,
|
| GrGLSLVaryingHandler*,
|
| const char* localCoords,
|
| const TransformsIn& tin,
|
| @@ -77,9 +77,9 @@ protected:
|
| };
|
|
|
| // Create the correct type of position variable given the CTM
|
| - void setupPosition(GrGLSLGPBuilder*, GrGLSLVertexBuilder*, GrGPArgs*, const char* posName);
|
| - void setupPosition(GrGLSLGPBuilder*,
|
| - GrGLSLVertexBuilder*,
|
| + void setupPosition(GrGLSLVertexBuilder*, GrGPArgs*, const char* posName);
|
| + void setupPosition(GrGLSLVertexBuilder*,
|
| + GrGLSLUniformHandler* uniformHandler,
|
| GrGPArgs*,
|
| const char* posName,
|
| const SkMatrix& mat,
|
|
|