aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/instanced
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-09-19 08:36:58 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-19 08:36:58 -0700
commitd91237ee051523f439238042674ade99207fe4a6 (patch)
treee53b2b1e356e1945863bc6a6446187ee1f4d76f2 /src/gpu/instanced
parent122fac306189940a4135e884eaef71a9aa0d5c8a (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 Review-Url: https://codereview.chromium.org/2339203002
Diffstat (limited to 'src/gpu/instanced')
-rw-r--r--src/gpu/instanced/InstanceProcessor.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gpu/instanced/InstanceProcessor.cpp b/src/gpu/instanced/InstanceProcessor.cpp
index 2b05ec1683..480155b683 100644
--- a/src/gpu/instanced/InstanceProcessor.cpp
+++ b/src/gpu/instanced/InstanceProcessor.cpp
@@ -80,7 +80,10 @@ public:
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override;
private:
- void setData(const GrGLSLProgramDataManager&, const GrPrimitiveProcessor&) override {}
+ void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor&,
+ FPCoordTransformIter&& transformIter) override {
+ this->setTransformDataHelper(SkMatrix::I(), pdman, &transformIter);
+ }
class VertexInputs;
class Backend;
@@ -388,7 +391,7 @@ void GLSLInstanceProcessor::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
gpArgs->fPositionVar.set(positionType, "deviceCoords");
this->emitTransforms(v, varyingHandler, uniHandler, gpArgs->fPositionVar, localCoords,
- args.fTransformsIn, args.fTransformsOut);
+ args.fFPCoordTransformHandler);
}
////////////////////////////////////////////////////////////////////////////////////////////////////