commit 8c31f2bf7f154e00952da9bdfbe3accc7691aecf
author Mike Reed <reed@google.com> Tue Jul 16 16:50:14 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jul 17 15:47:36 2019 +0000
tree 87e31a9ec896b5d9e28c9a802bc7ff18624d4a94
parent 0f78174b39fe68a3996cb78deae93a64eaa09a1e

use same signature for shader/colorfilters in sksl

'void main(float x, float y, inout half4 color)'

For colorfilters, x,y are uninitialized
For shaders, color is paint-color

Change-Id: I21c2f570702f117d33646bd8fba0ab4def20a118
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/227439
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/shaders/SkRTShader.cpp

diff --git a/src/shaders/SkRTShader.cpp b/src/shaders/SkRTShader.cpp
index bd5586e..565d7bc 100644
--- a/src/shaders/SkRTShader.cpp
+++ b/src/shaders/SkRTShader.cpp
@@ -12,33 +12,44 @@
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkWriteBuffer.h"
 
+#include "src/sksl/SkSLByteCode.h"
+#include "src/sksl/SkSLCompiler.h"
+
 #if SK_SUPPORT_GPU
+#include "include/private/GrRecordingContext.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrColorSpaceInfo.h"
+#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/SkGr.h"
+
 #include "src/gpu/GrFragmentProcessor.h"
 #include "src/gpu/effects/generated/GrMixerEffect.h"
 #include "src/gpu/effects/GrSkSLFP.h"
-#endif
 
-#include "src/sksl/SkSLByteCode.h"
-#include "src/sksl/SkSLCompiler.h"
+static inline uint32_t new_sksl_unique_id() {
+    return GrSkSLFP::NewIndex();
+}
+#else
+static inline uint32_t new_sksl_unique_id() {
+    return 0;   // not used w/o GPU
+}
+#endif
 
 SkRTShader::SkRTShader(SkString sksl, sk_sp<SkData> inputs, const SkMatrix* localMatrix,
                        bool isOpaque)
     : SkShaderBase(localMatrix)
     , fSkSL(std::move(sksl))
     , fInputs(std::move(inputs))
+    , fUniqueID(new_sksl_unique_id())
     , fIsOpaque(isOpaque)
 {}
 
 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();
     ctx->ninputs = fInputs->size() / 4;
-    ctx->shader_convention = true;
+    ctx->shaderConvention = true;
 
     SkAutoMutexExclusive ama(fByteCodeMutex);
     if (!fByteCode) {
@@ -61,7 +72,6 @@
     ctx->fn = ctx->byteCode->fFunctions[0].get();
 
     rec.fPipeline->append(SkRasterPipeline::seed_shader);
-    rec.fPipeline->append_matrix(rec.fAlloc, inverse);
     rec.fPipeline->append(SkRasterPipeline::interpreter, ctx);
     return true;
 }
@@ -114,3 +124,11 @@
     return sk_sp<SkShader>(new SkRTShader(std::move(sksl), std::move(inputs),
                                           localMatrix, isOpaque));
 }
+
+#if SK_SUPPORT_GPU
+std::unique_ptr<GrFragmentProcessor> SkRTShader::asFragmentProcessor(const GrFPArgs& args) const {
+    return GrSkSLFP::Make(args.fContext, fUniqueID, "runtime-shader", fSkSL,
+                          fInputs->data(), fInputs->size());
+}
+#endif
+