commit 48850575b921a7e005537949e679c5de1e502756
author Ethan Nicholas <ethannicholas@google.com> Thu Feb 25 14:45:38 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 25 21:35:00 2021 +0000
tree e810a719dcc0be841fdd4cb9cf9fc872790e18ec
parent ccb686685a6109cb8c92c3f0a4f2369994fc5163

Converted GrGaussianConvolutionFragmentProcessor to SkSL DSL

Change-Id: I75d29c0b93954fe72dd556d3ab3d8987fff38eaa
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/375778
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp

diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
index a9c33f4..449e5d6 100644
--- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
+++ b/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
@@ -15,6 +15,7 @@
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
+#include "src/sksl/dsl/priv/DSLFPs.h"
 
 // For brevity
 using UniformHandle = GrGLSLProgramDataManager::UniformHandle;
@@ -40,37 +41,34 @@
     const GrGaussianConvolutionFragmentProcessor& ce =
             args.fFp.cast<GrGaussianConvolutionFragmentProcessor>();
 
-    GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
-
-    const char* inc;
-    fIncrementUni = uniformHandler->addUniform(&ce, kFragment_GrShaderFlag, kHalf2_GrSLType,
-                                               "Increment", &inc);
+    using namespace SkSL::dsl;
+    StartFragmentProcessor(this, &args);
+    Var increment(kUniform_Modifier, kHalf2, "Increment");
+    fIncrementUni = VarUniformHandle(increment);
 
     int width = SkGpuBlurUtils::KernelWidth(ce.fRadius);
 
     int arrayCount = (width + 3) / 4;
     SkASSERT(4 * arrayCount >= width);
 
-    const char* kernel;
-    fKernelUni = uniformHandler->addUniformArray(&ce, kFragment_GrShaderFlag, kHalf4_GrSLType,
-                                                 "Kernel", arrayCount, &kernel);
+    Var kernel(kUniform_Modifier, Array(kHalf4, arrayCount), "Kernel");
+    fKernelUni = VarUniformHandle(kernel);
 
-    GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
+    Var color(kHalf4, "color");
+    Declare(color, Half4(0));
 
-    fragBuilder->codeAppendf("half4 color = half4(0);");
-
-    fragBuilder->codeAppendf("float2 coord = %s - %d.0 * %s;", args.fSampleCoord, ce.fRadius, inc);
+    Var coord(kFloat2, "coord");
+    Declare(coord, sk_SampleCoord() - ce.fRadius * increment);
 
     // Manually unroll loop because some drivers don't; yields 20-30% speedup.
     for (int i = 0; i < width; i++) {
-        auto sample = this->invokeChild(/*childIndex=*/0, args, "coord");
         if (i != 0) {
-            fragBuilder->codeAppendf("coord += %s;", inc);
+            coord += increment;
         }
-        fragBuilder->codeAppendf("color += %s * %s[%d][%d];",
-                                 sample.c_str(), kernel, i / 4, i & 0x3);
+        color += SampleChild(/*index=*/0, coord) * kernel[i / 4][i & 0x3];
     }
-    fragBuilder->codeAppendf("return color;");
+    Return(color);
+    EndFragmentProcessor();
 }
 
 void GrGaussianConvolutionFragmentProcessor::Impl::onSetData(const GrGLSLProgramDataManager& pdman,