diff options
| author |  bsalomon <bsalomon@google.com> | 2016-09-20 09:12:47 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-20 09:12:47 -0700 |
| commit | a624bf3d1cb454c1959c5bbbf23a3afdfa3481f3 (patch) | |
| tree | b400e7ace453c50cca2898353db69b79a3c023dd /src/gpu/glsl/GrGLSLProgramBuilder.h | |
| parent | be9d82161d8347929a66ef942dabbe56abf592a4 (diff) | |
Stop flattening GrCoordTransforms in parent GrFragmentProcessors.
This changes moves to a model that iterates over GrCTs in a GrFP hierarchy when inserting transformations by GrGLSLPrimitiveProcessors.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339203002
Committed: https://skia.googlesource.com/skia/+/d91237ee051523f439238042674ade99207fe4a6
Review-Url: https://codereview.chromium.org/2339203002
Diffstat (limited to 'src/gpu/glsl/GrGLSLProgramBuilder.h')
| -rw-r--r-- | src/gpu/glsl/GrGLSLProgramBuilder.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h index 27c84372c1..8a8cff55ad 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -139,9 +139,10 @@ private: void emitAndInstallPrimProc(const GrPrimitiveProcessor&, GrGLSLExpr4* outputColor, GrGLSLExpr4* outputCoverage); - void emitAndInstallFragProcs(int procOffset, int numProcs, GrGLSLExpr4* inOut); + void emitAndInstallFragProcs(GrGLSLExpr4* colorInOut, GrGLSLExpr4* coverageInOut); void emitAndInstallFragProc(const GrFragmentProcessor&, int index, + int transformedCoordVarsIdx, const GrGLSLExpr4& input, GrGLSLExpr4* output); void emitAndInstallXferProc(const GrXferProcessor&, @@ -167,11 +168,10 @@ private: void verify(const GrFragmentProcessor&); #endif - GrGLSLPrimitiveProcessor::TransformsIn fCoordTransforms; - GrGLSLPrimitiveProcessor::TransformsOut fOutCoords; - int fNumVertexSamplers; - int fNumGeometrySamplers; - int fNumFragmentSamplers; + int fNumVertexSamplers; + int fNumGeometrySamplers; + int fNumFragmentSamplers; + SkSTArray<4, GrShaderVar> fTransformedCoordVars; }; #endif |