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/GrProgramDesc.cpp | |
| 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/GrProgramDesc.cpp')
| -rw-r--r-- | src/gpu/GrProgramDesc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp index c452d34900..a22063c3f4 100644 --- a/src/gpu/GrProgramDesc.cpp +++ b/src/gpu/GrProgramDesc.cpp @@ -101,7 +101,7 @@ static bool gen_frag_proc_and_meta_keys(const GrPrimitiveProcessor& primProc, fp.getGLSLProcessorKey(glslCaps, b); return gen_meta_key(fp, glslCaps, primProc.getTransformKey(fp.coordTransforms(), - fp.numCoordTransforms()), b); + fp.numTransformsExclChildren()), b); } bool GrProgramDesc::Build(GrProgramDesc* desc, |