commit 3b1e4c268a2191aa8576eda9f446d3b2d370059c
author Brian Osman <brianosman@google.com> Mon Aug 12 15:12:14 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 14 18:08:49 2019 +0000
tree 2b3ffce2609fcfbb1ad8e400dc71f2c183d55b0a
parent 2e1142cc32e54dd5e147b6b388fdfcba32baa74f

Add coord transform to GrSKSLFP, support CTM/local matrix in runtime shaders

Change-Id: Ib44f08f4e958782cd5eb8461ef18305c14b1cde7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/233983
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/shaders/SkRTShader.cpp

diff --git a/src/shaders/SkRTShader.cpp b/src/shaders/SkRTShader.cpp
index 3c5c30c..6d59e55 100644
--- a/src/shaders/SkRTShader.cpp
+++ b/src/shaders/SkRTShader.cpp
@@ -45,6 +45,11 @@
 {}
 
 bool SkRTShader::onAppendStages(const SkStageRec& rec) const {
+    SkMatrix inverse;
+    if (!this->computeTotalInverse(rec.fCTM, rec.fLocalM, &inverse)) {
+        return false;
+    }
+
     auto ctx = rec.fAlloc->make<SkRasterPipeline_InterpreterCtx>();
     ctx->paintColor = rec.fPaint.getColor4f();
     ctx->inputs = fInputs->data();
@@ -75,6 +80,7 @@
     ctx->fn = ctx->byteCode->getFunction("main");
 
     rec.fPipeline->append(SkRasterPipeline::seed_shader);
+    rec.fPipeline->append_matrix(rec.fAlloc, inverse);
     rec.fPipeline->append(SkRasterPipeline::interpreter, ctx);
     return true;
 }
@@ -130,8 +136,12 @@
 
 #if SK_SUPPORT_GPU
 std::unique_ptr<GrFragmentProcessor> SkRTShader::asFragmentProcessor(const GrFPArgs& args) const {
+    SkMatrix matrix;
+    if (!this->totalLocalMatrix(args.fPreLocalMatrix, args.fPostLocalMatrix)->invert(&matrix)) {
+        return nullptr;
+    }
     return GrSkSLFP::Make(args.fContext, fUniqueID, "runtime-shader", fSkSL,
-                          fInputs->data(), fInputs->size());
+                          fInputs->data(), fInputs->size(), SkSL::Program::kPipelineStage_Kind,
+                          &matrix);
 }
 #endif
-