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/vk/GrVkPipelineState.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/vk/GrVkPipelineState.cpp')
-rw-r--r-- | src/gpu/vk/GrVkPipelineState.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index 50250a5ead..23983854da 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -194,13 +194,14 @@ void GrVkPipelineState::setData(GrVkGpu* gpu, SkSTArray<8, const GrTextureAccess*> textureBindings; - fGeometryProcessor->setData(fDataManager, primProc, - GrFragmentProcessor::CoordTransformIter(pipeline)); + fGeometryProcessor->setData(fDataManager, primProc); append_texture_bindings(primProc, &textureBindings); for (int i = 0; i < fFragmentProcessors.count(); ++i) { const GrFragmentProcessor& processor = pipeline.getFragmentProcessor(i); fFragmentProcessors[i]->setData(fDataManager, processor); + fGeometryProcessor->setTransformData(primProc, fDataManager, i, + processor.coordTransforms()); append_texture_bindings(processor, &textureBindings); } |