Revert "Wrap SkShader::program calls with #ifdef SK_ENABLE_SKVM."

This reverts commit 3acd1bf. Reason for revert: Chrome not ready for it Original change's description: > Wrap SkShader::program calls with #ifdef SK_ENABLE_SKVM. > > Change-Id: I3ad69746ecd66c60d2b77fc6e2314727ade227bc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/674656 > Commit-Queue: Herb Derby <[email protected]> > Reviewed-by: Herb Derby <[email protected]> > Auto-Submit: John Stiles <[email protected]> Change-Id: I849167b512d131e707734a90d0232e13762274e7 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/675120 Bot-Commit: Rubber Stamper <[email protected]> Auto-Submit: John Stiles <[email protected]> Commit-Queue: Rubber Stamper <[email protected]>
armansito · Apr 20, 2023 · 660953b · 660953b
1 parent 3acd1bf
commit 660953b
Show file tree

Hide file tree

Showing 22 changed files with 18 additions and 80 deletions.
diff --git a/src/core/SkDraw_atlas.cpp b/src/core/SkDraw_atlas.cpp
@@ -35,6 +35,7 @@
 #include "src/core/SkRasterPipelineOpList.h"
 #include "src/core/SkScan.h"
 #include "src/core/SkSurfacePriv.h"
+#include "src/core/SkVM.h"
 #include "src/core/SkVMBlitter.h"
 #include "src/shaders/SkShaderBase.h"
 #include "src/shaders/SkTransformShader.h"
@@ -44,13 +45,10 @@
 #include <utility>
 
 class SkBlitter;
+class SkColorInfo;
 class SkColorSpace;
 enum class SkBlendMode;
 
-#if defined(SK_ENABLE_SKVM)
-#include "src/core/SkVM.h"
-class SkColorInfo;
-#endif
 
 static void fill_rect(const SkMatrix& ctm, const SkRasterClip& rc,
                       const SkRect& r, SkBlitter* blitter, SkPath* scratchPath) {
@@ -83,7 +81,6 @@ class UpdatableColorShader : public SkShaderBase {
 public:
     explicit UpdatableColorShader(SkColorSpace* cs)
         : fSteps{sk_srgb_singleton(), kUnpremul_SkAlphaType, cs, kUnpremul_SkAlphaType} {}
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder* builder,
                         skvm::Coord device,
                         skvm::Coord local,
@@ -100,7 +97,6 @@ class UpdatableColorShader : public SkShaderBase {
 
         return {r, g, b, a};
     }
-#endif
 
     void updateColor(SkColor c) const {
         SkColor4f c4 = SkColor4f::FromColor(c);

diff --git a/src/core/SkDraw_vertices.cpp b/src/core/SkDraw_vertices.cpp
@@ -41,6 +41,7 @@
 #include "src/core/SkRasterPipelineOpList.h"
 #include "src/core/SkScan.h"
 #include "src/core/SkSurfacePriv.h"
+#include "src/core/SkVM.h"
 #include "src/core/SkVMBlitter.h"
 #include "src/core/SkVertState.h"
 #include "src/core/SkVerticesPriv.h"
@@ -54,10 +55,6 @@
 
 class SkBlitter;
 
-#if defined(SK_ENABLE_SKVM)
-#include "src/core/SkVM.h"
-#endif
-
 struct Matrix43 {
     float fMat[12];    // column major
 
@@ -125,7 +122,6 @@ class SkTriColorShader : public SkShaderBase {
         return true;
     }
 
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder*,
                         skvm::Coord,
                         skvm::Coord,
@@ -134,7 +130,6 @@ class SkTriColorShader : public SkShaderBase {
                         const SkColorInfo&,
                         skvm::Uniforms*,
                         SkArenaAlloc*) const override;
-#endif
 
 private:
     bool isOpaque() const override { return fIsOpaque; }
@@ -149,15 +144,12 @@ class SkTriColorShader : public SkShaderBase {
     SkMatrix fM33;
     const bool fIsOpaque;
     const bool fUsePersp;   // controls our stages, and what we do in update()
-#if defined(SK_ENABLE_SKVM)
     mutable skvm::Uniform fColorMatrix;
     mutable skvm::Uniform fCoordMatrix;
-#endif
 
     using INHERITED = SkShaderBase;
 };
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkTriColorShader::program(skvm::Builder* b,
                                       skvm::Coord device,
                                       skvm::Coord local,
@@ -198,7 +190,6 @@ skvm::Color SkTriColorShader::program(skvm::Builder* b,
     color.a = colorDot(3);
     return color;
 }
-#endif
 
 bool SkTriColorShader::update(const SkMatrix& ctmInv, const SkPoint pts[],
                               const SkPMColor4f colors[], int index0, int index1, int index2) {

diff --git a/src/core/SkRuntimeEffect.cpp b/src/core/SkRuntimeEffect.cpp
@@ -438,7 +438,7 @@ static void write_child_effects(SkWriteBuffer& buffer,
     }
 }
 
-#ifdef SK_ENABLE_SKVM
+#ifndef SK_ENABLE_SKSL_IN_RASTER_PIPELINE
 static std::vector<skvm::Val> make_skvm_uniforms(skvm::Builder* p,
                                                  skvm::Uniforms* uniforms,
                                                  size_t inputSize,
@@ -952,7 +952,6 @@ class RuntimeEffectVMCallbacks : public SkSL::SkVMCallbacks {
             , fColorInfo(colorInfo) {}
 
     skvm::Color sampleShader(int ix, skvm::Coord coord) override {
-#if defined(SK_ENABLE_SKVM)
         // We haven't tracked device coords and the runtime effect could have arbitrarily
         // manipulated the passed coords. We should be in a state where any pending matrix was
         // already applied before the runtime effect's code could have manipulated the coords
@@ -969,7 +968,6 @@ class RuntimeEffectVMCallbacks : public SkSL::SkVMCallbacks {
                                           fUniforms,
                                           fAlloc);
         }
-#endif
         return fInColor;
     }
 
@@ -1093,7 +1091,9 @@ class SkRuntimeColorFilter : public SkColorFilterBase {
     skvm::Color onProgram(skvm::Builder* p, skvm::Color c,
                           const SkColorInfo& colorInfo,
                           skvm::Uniforms* uniforms, SkArenaAlloc* alloc) const override {
-#ifdef SK_ENABLE_SKVM
+#ifdef SK_ENABLE_SKSL_IN_RASTER_PIPELINE
+        return {};
+#else
         SkASSERT(SkRuntimeEffectPriv::CanDraw(SkCapabilities::RasterBackend().get(),
                                               fEffect.get()));
 
@@ -1115,8 +1115,6 @@ class SkRuntimeColorFilter : public SkColorFilterBase {
         return SkSL::ProgramToSkVM(*fEffect->fBaseProgram, fEffect->fMain, p,/*debugTrace=*/nullptr,
                                    SkSpan(uniform), /*device=*/zeroCoord, /*local=*/zeroCoord,
                                    c, c, &callbacks);
-#else
-        return {};
 #endif
     }
 
@@ -1317,7 +1315,6 @@ class SkRTShader : public SkShaderBase {
         return false;
     }
 
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder* p,
                         skvm::Coord device,
                         skvm::Coord local,
@@ -1326,6 +1323,9 @@ class SkRTShader : public SkShaderBase {
                         const SkColorInfo& colorInfo,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc* alloc) const override {
+#ifdef SK_ENABLE_SKSL_IN_RASTER_PIPELINE
+        return {};
+#else
         if (!SkRuntimeEffectPriv::CanDraw(SkCapabilities::RasterBackend().get(), fEffect.get())) {
             return {};
         }
@@ -1357,8 +1357,8 @@ class SkRTShader : public SkShaderBase {
 
         return SkSL::ProgramToSkVM(*fEffect->fBaseProgram, fEffect->fMain, p, fDebugTrace.get(),
                                    SkSpan(uniform), device, local, paint, paint, &callbacks);
-    }
 #endif
+    }
 
     void flatten(SkWriteBuffer& buffer) const override {
         buffer.writeString(fEffect->source().c_str());
@@ -1475,7 +1475,9 @@ class SkRuntimeBlender : public SkBlenderBase {
     skvm::Color onProgram(skvm::Builder* p, skvm::Color src, skvm::Color dst,
                           const SkColorInfo& colorInfo, skvm::Uniforms* uniforms,
                           SkArenaAlloc* alloc) const override {
-#ifdef SK_ENABLE_SKVM
+#ifdef SK_ENABLE_SKSL_IN_RASTER_PIPELINE
+        return {};
+#else
         if (!SkRuntimeEffectPriv::CanDraw(SkCapabilities::RasterBackend().get(), fEffect.get())) {
             return {};
         }
@@ -1496,8 +1498,6 @@ class SkRuntimeBlender : public SkBlenderBase {
         return SkSL::ProgramToSkVM(*fEffect->fBaseProgram, fEffect->fMain, p,/*debugTrace=*/nullptr,
                                    SkSpan(uniform), /*device=*/zeroCoord, /*local=*/zeroCoord,
                                    src, dst, &callbacks);
-#else
-        return {};
 #endif
     }
 

diff --git a/src/shaders/SkColorFilterShader.cpp b/src/shaders/SkColorFilterShader.cpp
@@ -68,7 +68,6 @@ bool SkColorFilterShader::appendStages(const SkStageRec& rec, const MatrixRec& m
     return true;
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkColorFilterShader::program(skvm::Builder* p,
                                          skvm::Coord device,
                                          skvm::Coord local,
@@ -94,7 +93,7 @@ skvm::Color SkColorFilterShader::program(skvm::Builder* p,
     // Finally run that through the color filter.
     return fFilter->program(p,c, dst, uniforms,alloc);
 }
-#endif
+
 #if defined(SK_GANESH)
 /////////////////////////////////////////////////////////////////////
 

diff --git a/src/shaders/SkColorFilterShader.h b/src/shaders/SkColorFilterShader.h
@@ -32,7 +32,6 @@ class SkColorFilterShader : public SkShaderBase {
     void flatten(SkWriteBuffer&) const override;
     bool appendStages(const SkStageRec&, const MatrixRec&) const override;
 
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder*,
                         skvm::Coord device,
                         skvm::Coord local,
@@ -41,7 +40,6 @@ class SkColorFilterShader : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc*) const override;
-#endif
 
     SK_FLATTENABLE_HOOKS(SkColorFilterShader)
 

diff --git a/src/shaders/SkColorShader.cpp b/src/shaders/SkColorShader.cpp
@@ -64,7 +64,6 @@ class SkColorShader : public SkShaderBase {
 
     bool appendStages(const SkStageRec&, const MatrixRec&) const override;
 
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder*,
                         skvm::Coord device,
                         skvm::Coord local,
@@ -73,7 +72,6 @@ class SkColorShader : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc*) const override;
-#endif
 
     SkColor fColor;
 };
@@ -102,7 +100,6 @@ class SkColor4Shader : public SkShaderBase {
     void flatten(SkWriteBuffer&) const override;
     bool appendStages(const SkStageRec&, const MatrixRec&) const override;
 
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder*,
                         skvm::Coord device,
                         skvm::Coord local,
@@ -111,7 +108,6 @@ class SkColor4Shader : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc*) const override;
-#endif
 
     sk_sp<SkColorSpace> fColorSpace;
     const SkColor4f     fColor;
@@ -189,7 +185,6 @@ bool SkColor4Shader::appendStages(const SkStageRec& rec, const MatrixRec&) const
     return true;
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkColorShader::program(skvm::Builder* p,
                                    skvm::Coord /*device*/,
                                    skvm::Coord /*local*/,
@@ -203,7 +198,6 @@ skvm::Color SkColorShader::program(skvm::Builder* p,
                               dst.colorSpace(),   kPremul_SkAlphaType).apply(color.vec());
     return p->uniformColor(color, uniforms);
 }
-
 skvm::Color SkColor4Shader::program(skvm::Builder* p,
                                     skvm::Coord /*device*/,
                                     skvm::Coord /*local*/,
@@ -217,7 +211,6 @@ skvm::Color SkColor4Shader::program(skvm::Builder* p,
                             dst.colorSpace(),   kPremul_SkAlphaType).apply(color.vec());
     return p->uniformColor(color, uniforms);
 }
-#endif  // defined(SK_ENABLE_SKVM)
 
 #if defined(SK_GANESH)
 

diff --git a/src/shaders/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp
@@ -48,8 +48,6 @@ class SkShader_Blend final : public SkShaderBase {
     SkShader_Blend(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const override;
     bool appendStages(const SkStageRec&, const MatrixRec&) const override;
-
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder*,
                         skvm::Coord device,
                         skvm::Coord local,
@@ -58,7 +56,6 @@ class SkShader_Blend final : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms*,
                         SkArenaAlloc*) const override;
-#endif  // defined(SK_ENABLE_SKVM)
 
 private:
     friend void ::SkRegisterComposeShaderFlattenable();
@@ -142,7 +139,6 @@ bool SkShader_Blend::appendStages(const SkStageRec& rec, const MatrixRec& mRec)
     return true;
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkShader_Blend::program(skvm::Builder* p,
                                     skvm::Coord device,
                                     skvm::Coord local,
@@ -158,7 +154,6 @@ skvm::Color SkShader_Blend::program(skvm::Builder* p,
     }
     return {};
 }
-#endif
 
 #if defined(SK_GANESH)
 

diff --git a/src/shaders/SkCoordClampShader.cpp b/src/shaders/SkCoordClampShader.cpp
@@ -46,7 +46,6 @@ class SkShader_CoordClamp final : public SkShaderBase {
     SkShader_CoordClamp(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const override;
     bool appendStages(const SkStageRec&, const MatrixRec&) const override;
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder*,
                         skvm::Coord device,
                         skvm::Coord local,
@@ -55,7 +54,6 @@ class SkShader_CoordClamp final : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms*,
                         SkArenaAlloc*) const override;
-#endif
 
 private:
     friend void ::SkRegisterCoordClampShaderFlattenable();
@@ -93,7 +91,6 @@ bool SkShader_CoordClamp::appendStages(const SkStageRec& rec, const MatrixRec& m
     return as_SB(fShader)->appendStages(rec, *childMRec);
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkShader_CoordClamp::program(skvm::Builder* p,
                                          skvm::Coord device,
                                          skvm::Coord local,
@@ -118,7 +115,6 @@ skvm::Color SkShader_CoordClamp::program(skvm::Builder* p,
 
     return as_SB(fShader)->program(p, device, local, paint, *childMRec, cinfo, uniforms, alloc);
 }
-#endif
 
 #if defined(SK_GANESH)
 std::unique_ptr<GrFragmentProcessor> SkShader_CoordClamp::asFragmentProcessor(

diff --git a/src/shaders/SkEmptyShader.cpp b/src/shaders/SkEmptyShader.cpp
@@ -27,7 +27,6 @@ class SkEmptyShader : public SkShaderBase {
 
     bool appendStages(const SkStageRec&, const MatrixRec&) const override { return false; }
 
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder*,
                         skvm::Coord,
                         skvm::Coord,
@@ -36,7 +35,6 @@ class SkEmptyShader : public SkShaderBase {
                         const SkColorInfo&,
                         skvm::Uniforms*,
                         SkArenaAlloc*) const override;
-#endif
 
 private:
     friend void ::SkRegisterEmptyShaderFlattenable();
@@ -45,7 +43,6 @@ class SkEmptyShader : public SkShaderBase {
     using INHERITED = SkShaderBase;
 };
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkEmptyShader::program(skvm::Builder*,
                                    skvm::Coord,
                                    skvm::Coord,
@@ -56,7 +53,6 @@ skvm::Color SkEmptyShader::program(skvm::Builder*,
                                    SkArenaAlloc*) const {
     return {};  // signal failure
 }
-#endif
 
 sk_sp<SkFlattenable> SkEmptyShader::CreateProc(SkReadBuffer&) {
     return SkShaders::Empty();

diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
@@ -854,7 +854,6 @@ bool SkImageShader::appendStages(const SkStageRec& rec, const MatrixRec& mRec) c
     return append_misc();
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkImageShader::program(skvm::Builder* p,
                                    skvm::Coord device,
                                    skvm::Coord origLocal,
@@ -1143,4 +1142,3 @@ skvm::Color SkImageShader::program(skvm::Builder* p,
                 : SkColorSpaceXformSteps{cs, at, dst.colorSpace(), dst.alphaType()}.program(
                           p, uniforms, c);
 }
-#endif