diff options
| author |  bsalomon <bsalomon@google.com> | 2016-09-19 09:26:40 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-19 09:26:40 -0700 |
| commit | 56b7dc476ba5e4a53ab24b5830b5ed03e404006d (patch) | |
| tree | 043e07baf151bab960421fbfc06af7e09bf9b67e /src/gpu/glsl/GrGLSLProgramBuilder.h | |
| parent | 9f262811b79f2c3f2c52c03cc2947431a36e8fbe (diff) | |
Revert of Stop flattening GrCoordTransforms in parent GrFragmentProcessors. (patchset #3 id:40001 of https://codereview.chromium.org/2339203002/ )
Reason for revert:
Crashing blink
https://codereview.chromium.org/2351743002/
Original issue's description:
> 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
TBR=egdaniel@google.com,robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2351753002
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 8a8cff55ad..27c84372c1 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/glsl/GrGLSLProgramBuilder.h @@ -139,10 +139,9 @@ private: 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 @@ private: 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 |