diff --git a/src/core/SkDraw_atlas.cpp b/src/core/SkDraw_atlas.cpp
index 8b50a11f856d..54bf06734cb9 100644
--- 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
index 4d20fd607c12..78c48d113566 100644
--- 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
index 45f6a9bed6e9..2ea44a5eb6d4 100644
--- 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
index eee266cc12d0..7ff7e8dd508a 100644
--- 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
index 9ab514f4e975..4cdbea6a45b0 100644
--- 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
index 829b29111d6d..149b155d6273 100644
--- 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
index 767aa5e48c9d..99ddbd9e0b42 100644
--- 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
index a9ee1418e1a7..f65e7d9f1098 100644
--- 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
index 9c836b8292fc..94040338a882 100644
--- 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
index 69c7032add81..c595f09893ed 100644
--- 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
diff --git a/src/shaders/SkImageShader.h b/src/shaders/SkImageShader.h
index 8faa2a21ed49..3740aec1f844 100644
--- a/src/shaders/SkImageShader.h
+++ b/src/shaders/SkImageShader.h
@@ -78,7 +78,6 @@ class SkImageShader : 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,
@@ -87,7 +86,6 @@ class SkImageShader : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc*) const override;
-#endif  // defined(SK_ENABLE_SKVM)
 
     sk_sp<SkImage>          fImage;
     const SkSamplingOptions fSampling;
diff --git a/src/shaders/SkLocalMatrixShader.cpp b/src/shaders/SkLocalMatrixShader.cpp
index 7744bffe423a..ceddf24c53a8 100644
--- a/src/shaders/SkLocalMatrixShader.cpp
+++ b/src/shaders/SkLocalMatrixShader.cpp
@@ -101,7 +101,6 @@ bool SkLocalMatrixShader::appendStages(const SkStageRec& rec, const MatrixRec& m
     return as_SB(fWrappedShader)->appendStages(rec, mRec.concat(fLocalMatrix));
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkLocalMatrixShader::program(skvm::Builder* p,
                                          skvm::Coord device,
                                          skvm::Coord local,
@@ -119,7 +118,6 @@ skvm::Color SkLocalMatrixShader::program(skvm::Builder* p,
                                           uniforms,
                                           alloc);
 }
-#endif
 
 sk_sp<SkShader> SkShader::makeWithLocalMatrix(const SkMatrix& localMatrix) const {
     if (localMatrix.isIdentity()) {
@@ -172,7 +170,6 @@ class SkCTMShader final : public SkShaderBase {
         return as_SB(fProxyShader)->appendRootStages(rec, fCTM);
     }
 
-#if defined(SK_ENABLE_SKVM)
     skvm::Color program(skvm::Builder* p,
                         skvm::Coord device,
                         skvm::Coord local,
@@ -183,7 +180,6 @@ class SkCTMShader final : public SkShaderBase {
                         SkArenaAlloc* alloc) const override {
         return as_SB(fProxyShader)->rootProgram(p, device, paint, fCTM, dst, uniforms, alloc);
     }
-#endif
 
 private:
     SK_FLATTENABLE_HOOKS(SkCTMShader)
diff --git a/src/shaders/SkLocalMatrixShader.h b/src/shaders/SkLocalMatrixShader.h
index 12b62beddc84..e4b186621ee9 100644
--- a/src/shaders/SkLocalMatrixShader.h
+++ b/src/shaders/SkLocalMatrixShader.h
@@ -60,7 +60,6 @@ class SkLocalMatrixShader final : 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,
@@ -69,7 +68,6 @@ class SkLocalMatrixShader final : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc*) const override;
-#endif
 
 private:
     SK_FLATTENABLE_HOOKS(SkLocalMatrixShader)
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 3cfdb7028d50..9a034a4c4640 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -319,7 +319,7 @@ class SkPerlinNoiseShaderImpl : public SkShaderBase {
                   skgpu::graphite::PaintParamsKeyBuilder*,
                   skgpu::graphite::PipelineDataGatherer*) const override;
 #endif
-#if defined(SK_ENABLE_SKVM)
+
     skvm::Color program(skvm::Builder*,
                         skvm::Coord,
                         skvm::Coord,
@@ -328,10 +328,9 @@ class SkPerlinNoiseShaderImpl : public SkShaderBase {
                         const SkColorInfo&,
                         skvm::Uniforms*,
                         SkArenaAlloc*) const override {
-        // Unimplemented
+        // TODO?
         return {};
     }
-#endif
 
 protected:
     void flatten(SkWriteBuffer&) const override;
diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp
index 84dae35f9828..75d4f3f94ee2 100644
--- a/src/shaders/SkPictureShader.cpp
+++ b/src/shaders/SkPictureShader.cpp
@@ -322,7 +322,6 @@ bool SkPictureShader::appendStages(const SkStageRec& rec, const MatrixRec& mRec)
     return as_SB(bitmapShader)->appendStages(rec, mRec);
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkPictureShader::program(skvm::Builder* p,
                                      skvm::Coord device,
                                      skvm::Coord local,
@@ -343,7 +342,6 @@ skvm::Color SkPictureShader::program(skvm::Builder* p,
 
     return as_SB(bitmapShader)->program(p, device, local, paint, mRec, dst, uniforms, alloc);
 }
-#endif
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/shaders/SkPictureShader.h b/src/shaders/SkPictureShader.h
index f4c9f1a91fca..3f2942bc9a68 100644
--- a/src/shaders/SkPictureShader.h
+++ b/src/shaders/SkPictureShader.h
@@ -43,7 +43,6 @@ class SkPictureShader : public SkShaderBase {
     SkPictureShader(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,
@@ -52,7 +51,7 @@ class SkPictureShader : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc* alloc) const override;
-#endif
+
 #ifdef SK_ENABLE_LEGACY_SHADERCONTEXT
     Context* onMakeContext(const ContextRec&, SkArenaAlloc*) const override;
 #endif
diff --git a/src/shaders/SkShader.cpp b/src/shaders/SkShader.cpp
index 83fe7ebc6ab0..83eee34278a1 100644
--- a/src/shaders/SkShader.cpp
+++ b/src/shaders/SkShader.cpp
@@ -258,7 +258,6 @@ bool SkShaderBase::appendStages(const SkStageRec& rec, const MatrixRec& mRec) co
     return false;
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkShaderBase::rootProgram(skvm::Builder* p,
                                       skvm::Coord device,
                                       skvm::Color paint,
@@ -299,7 +298,6 @@ skvm::Color SkShaderBase::rootProgram(skvm::Builder* p,
     }
     return {};
 }
-#endif  // defined(SK_ENABLE_SKVM)
 
 // need a cheap way to invert the alpha channel of a shader (i.e. 1 - a)
 sk_sp<SkShader> SkShaderBase::makeInvertAlpha() const {
diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h
index 95bc68837bc6..d6348c28590e 100644
--- a/src/shaders/SkShaderBase.h
+++ b/src/shaders/SkShaderBase.h
@@ -400,7 +400,6 @@ class SkShaderBase : public SkShader {
      */
     virtual sk_sp<SkShader> makeAsALocalMatrixShader(SkMatrix* localMatrix) const;
 
-#if defined(SK_ENABLE_SKVM)
     /**
      * Called at the root of a shader tree to build a VM that produces color. The device coords
      * should be initialized to the centers of device space pixels being shaded and the inverse of
@@ -428,7 +427,6 @@ class SkShaderBase : public SkShader {
                                 const SkColorInfo& dst,
                                 skvm::Uniforms*,
                                 SkArenaAlloc*) const = 0;
-#endif  // defined(SK_ENABLE_SKVM)
 
 #if defined(SK_GRAPHITE)
     /**
diff --git a/src/shaders/SkTransformShader.cpp b/src/shaders/SkTransformShader.cpp
index afe52cdc926b..080560a7828d 100644
--- a/src/shaders/SkTransformShader.cpp
+++ b/src/shaders/SkTransformShader.cpp
@@ -14,7 +14,6 @@ SkTransformShader::SkTransformShader(const SkShaderBase& shader, bool allowPersp
     SkMatrix::I().get9(fMatrixStorage);
 }
 
-#if defined(SK_ENABLE_SKVM)
 skvm::Color SkTransformShader::program(skvm::Builder* b,
                                        skvm::Coord device,
                                        skvm::Coord local,
@@ -61,7 +60,6 @@ skvm::Color SkTransformShader::program(skvm::Builder* b,
     skvm::Coord newLocal = {x, y};
     return fShader.program(b, device, newLocal, color, *childMRec, dst, uniforms, alloc);
 }
-#endif
 
 bool SkTransformShader::update(const SkMatrix& matrix) {
     if (SkMatrix inv; matrix.invert(&inv)) {
diff --git a/src/shaders/SkTransformShader.h b/src/shaders/SkTransformShader.h
index f536cf41593f..f04d4baad609 100644
--- a/src/shaders/SkTransformShader.h
+++ b/src/shaders/SkTransformShader.h
@@ -20,7 +20,6 @@ class SkTransformShader : public SkShaderBase {
 public:
     explicit SkTransformShader(const SkShaderBase& shader, bool allowPerspective);
 
-#if defined(SK_ENABLE_SKVM)
     // Adds instructions to use the mapping stored in the uniforms represented by fMatrix. After
     // generating a new skvm::Coord, it passes the mapped coordinates to fShader's program
     // along with the identity matrix.
@@ -32,7 +31,6 @@ class SkTransformShader : public SkShaderBase {
                         const SkColorInfo& dst,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc* alloc) const override;
-#endif
 
     // Adds a pipestage to multiply the incoming coords in 'r' and 'g' by the matrix. The child
     // shader is called with no pending local matrix and the total transform as unknowable.
diff --git a/src/shaders/gradients/SkGradientShaderBase.cpp b/src/shaders/gradients/SkGradientShaderBase.cpp
index 3dde0109f2bb..07add6950ee7 100644
--- a/src/shaders/gradients/SkGradientShaderBase.cpp
+++ b/src/shaders/gradients/SkGradientShaderBase.cpp
@@ -485,7 +485,6 @@ bool SkGradientShaderBase::appendStages(const SkStageRec& rec, const MatrixRec&
     return true;
 }
 
-#if defined(SK_ENABLE_SKVM)
 // Color conversion functions used in gradient interpolation, based on
 // https://www.w3.org/TR/css-color-4/#color-conversion-code
 static skvm::Color css_lab_to_xyz(skvm::Color lab) {
@@ -805,7 +804,6 @@ skvm::Color SkGradientShaderBase::program(skvm::Builder* p,
         pun_to_F32(mask & pun_to_I32(color.a)),
     };
 }
-#endif  // defined(SK_ENABLE_SKVM)
 
 bool SkGradientShaderBase::isOpaque() const {
     return fColorsAreOpaque && (this->getTileMode() != SkTileMode::kDecal);
diff --git a/src/shaders/gradients/SkGradientShaderBase.h b/src/shaders/gradients/SkGradientShaderBase.h
index 9c17e686f774..0e4a6cec0935 100644
--- a/src/shaders/gradients/SkGradientShaderBase.h
+++ b/src/shaders/gradients/SkGradientShaderBase.h
@@ -100,7 +100,6 @@ class SkGradientShaderBase : 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,
@@ -109,7 +108,6 @@ class SkGradientShaderBase : public SkShaderBase {
                         const SkColorInfo& dstCS,
                         skvm::Uniforms* uniforms,
                         SkArenaAlloc* alloc) const override;
-#endif
 
     virtual void appendGradientStages(SkArenaAlloc* alloc, SkRasterPipeline* tPipeline,
                                       SkRasterPipeline* postPipeline) const = 0;