| Index: src/gpu/glsl/GrGLSLProgramBuilder.h
|
| diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| index 8a8cff55add2238d3da3db8d96b5600c79051151..27c84372c1aeaaddab852f5122f9d39a3be8b611 100644
|
| --- a/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h
|
| @@ -139,10 +139,9 @@
|
| void emitAndInstallPrimProc(const GrPrimitiveProcessor&,
|
| GrGLSLExpr4* outputColor,
|
| GrGLSLExpr4* outputCoverage);
|
| - void emitAndInstallFragProcs(GrGLSLExpr4* colorInOut, GrGLSLExpr4* coverageInOut);
|
| + void emitAndInstallFragProcs(int procOffset, int numProcs, GrGLSLExpr4* inOut);
|
| void emitAndInstallFragProc(const GrFragmentProcessor&,
|
| int index,
|
| - int transformedCoordVarsIdx,
|
| const GrGLSLExpr4& input,
|
| GrGLSLExpr4* output);
|
| void emitAndInstallXferProc(const GrXferProcessor&,
|
| @@ -168,10 +167,11 @@
|
| void verify(const GrFragmentProcessor&);
|
| #endif
|
|
|
| - int fNumVertexSamplers;
|
| - int fNumGeometrySamplers;
|
| - int fNumFragmentSamplers;
|
| - SkSTArray<4, GrShaderVar> fTransformedCoordVars;
|
| + GrGLSLPrimitiveProcessor::TransformsIn fCoordTransforms;
|
| + GrGLSLPrimitiveProcessor::TransformsOut fOutCoords;
|
| + int fNumVertexSamplers;
|
| + int fNumGeometrySamplers;
|
| + int fNumFragmentSamplers;
|
| };
|
|
|
| #endif
|
|
|