commit a6919c655ec6f96a6d51ccc33d6dd2ab292e1434
author Robert Phillips <robertphillips@google.com> Wed Sep 30 11:20:13 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 30 17:28:53 2020 +0000
tree 4578ee32aade1e63f65f54c6ba64ef2fe484b30c
parent 3fb66b557dcc017cbd536d1bb9fecf2ec092d0f2

Make GrRectBlurEffect use the thread-safe view cache

This, maybe, yields a slight perf improvement for the blur_matrix_rect
GM but, regardless, is good form.

Bug: 1108408
Change-Id: I6d589cc0f08f4264419ab33f27ac5a503cd036e8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320933
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/effects/generated/GrRectBlurEffect.cpp

diff --git a/src/gpu/effects/generated/GrRectBlurEffect.cpp b/src/gpu/effects/generated/GrRectBlurEffect.cpp
index 594f97e..89cdc5d 100644
--- a/src/gpu/effects/generated/GrRectBlurEffect.cpp
+++ b/src/gpu/effects/generated/GrRectBlurEffect.cpp
@@ -68,14 +68,14 @@
                 rectFVar.isValid() ? args.fUniformHandler->getUniformCStr(rectFVar) : "float4(0)",
                 rectHVar.isValid() ? args.fUniformHandler->getUniformCStr(rectHVar) : "half4(0)",
                 rectHVar.isValid() ? args.fUniformHandler->getUniformCStr(rectHVar) : "half4(0)");
-        SkString _coords8354("float2(half2(xy.x, 0.5))");
-        SkString _sample8354 = this->invokeChild(1, args, _coords8354.c_str());
+        SkString _coords8175("float2(half2(xy.x, 0.5))");
+        SkString _sample8175 = this->invokeChild(1, args, _coords8175.c_str());
         fragBuilder->codeAppendf(
                 R"SkSL(
     xCoverage = %s.w;)SkSL",
-                _sample8354.c_str());
-        SkString _coords8412("float2(half2(xy.y, 0.5))");
-        SkString _sample8412 = this->invokeChild(1, args, _coords8412.c_str());
+                _sample8175.c_str());
+        SkString _coords8233("float2(half2(xy.y, 0.5))");
+        SkString _sample8233 = this->invokeChild(1, args, _coords8233.c_str());
         fragBuilder->codeAppendf(
                 R"SkSL(
     yCoverage = %s.w;
@@ -88,35 +88,35 @@
         rect.xy = half2(float2(%s.xy) - pos);
         rect.zw = half2(pos - float2(%s.zw));
     })SkSL",
-                _sample8412.c_str(),
+                _sample8233.c_str(),
                 rectFVar.isValid() ? args.fUniformHandler->getUniformCStr(rectFVar) : "float4(0)",
                 rectFVar.isValid() ? args.fUniformHandler->getUniformCStr(rectFVar) : "float4(0)",
                 rectHVar.isValid() ? args.fUniformHandler->getUniformCStr(rectHVar) : "half4(0)",
                 rectHVar.isValid() ? args.fUniformHandler->getUniformCStr(rectHVar) : "half4(0)");
-        SkString _coords9731("float2(half2(rect.x, 0.5))");
-        SkString _sample9731 = this->invokeChild(1, args, _coords9731.c_str());
-        SkString _coords9794("float2(half2(rect.z, 0.5))");
-        SkString _sample9794 = this->invokeChild(1, args, _coords9794.c_str());
+        SkString _coords9552("float2(half2(rect.x, 0.5))");
+        SkString _sample9552 = this->invokeChild(1, args, _coords9552.c_str());
+        SkString _coords9615("float2(half2(rect.z, 0.5))");
+        SkString _sample9615 = this->invokeChild(1, args, _coords9615.c_str());
         fragBuilder->codeAppendf(
                 R"SkSL(
     xCoverage = (1.0 - %s.w) - %s.w;)SkSL",
-                _sample9731.c_str(), _sample9794.c_str());
-        SkString _coords9858("float2(half2(rect.y, 0.5))");
-        SkString _sample9858 = this->invokeChild(1, args, _coords9858.c_str());
-        SkString _coords9921("float2(half2(rect.w, 0.5))");
-        SkString _sample9921 = this->invokeChild(1, args, _coords9921.c_str());
+                _sample9552.c_str(), _sample9615.c_str());
+        SkString _coords9679("float2(half2(rect.y, 0.5))");
+        SkString _sample9679 = this->invokeChild(1, args, _coords9679.c_str());
+        SkString _coords9742("float2(half2(rect.w, 0.5))");
+        SkString _sample9742 = this->invokeChild(1, args, _coords9742.c_str());
         fragBuilder->codeAppendf(
                 R"SkSL(
     yCoverage = (1.0 - %s.w) - %s.w;
 })SkSL",
-                _sample9858.c_str(), _sample9921.c_str());
-        SkString _sample9990 = this->invokeChild(0, args);
+                _sample9679.c_str(), _sample9742.c_str());
+        SkString _sample9811 = this->invokeChild(0, args);
         fragBuilder->codeAppendf(
                 R"SkSL(
 half4 inputColor = %s;
 %s = (inputColor * xCoverage) * yCoverage;
 )SkSL",
-                _sample9990.c_str(), args.fOutputColor);
+                _sample9811.c_str(), args.fOutputColor);
     }
 
 private: