Remove "f" suffix from literal in LCD DF text shader.

Also improve DF GP names
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2340603003

Review-Url: https://codereview.chromium.org/2340603003

diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
index be7b9ac..c74c5ce 100644 (file)
--- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
@@ -720,7 +720,7 @@ public:
         // mapped linearly to coverage, so use a linear step:
         if (isGammaCorrect) {
             fragBuilder->codeAppend("vec4 val = "
-                "vec4(clamp(distance + vec3(afwidth) / vec3(2.0 * afwidth), 0.0, 1.0), 1.0f);");
+                "vec4(clamp(distance + vec3(afwidth) / vec3(2.0 * afwidth), 0.0, 1.0), 1.0);");
         } else {
             fragBuilder->codeAppend(
                 "vec4 val = vec4(smoothstep(vec3(-afwidth), vec3(afwidth), distance), 1.0);");

diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h
index 0f6d8c1..339c063 100644 (file)
--- a/src/gpu/effects/GrDistanceFieldGeoProc.h
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.h
@@ -68,7 +68,7 @@ public:
 
     virtual ~GrDistanceFieldA8TextGeoProc() {}
 
-    const char* name() const override { return "DistanceFieldTexture"; }
+    const char* name() const override { return "DistanceFieldA8Text"; }
 
     const Attribute* inPosition() const { return fInPosition; }
     const Attribute* inColor() const { return fInColor; }
@@ -129,7 +129,7 @@ public:
 
     virtual ~GrDistanceFieldPathGeoProc() {}
 
-    const char* name() const override { return "DistanceFieldTexture"; }
+    const char* name() const override { return "DistanceFieldPath"; }
 
     const Attribute* inPosition() const { return fInPosition; }
     const Attribute* inColor() const { return fInColor; }
@@ -197,7 +197,7 @@ public:
 
     virtual ~GrDistanceFieldLCDTextGeoProc() {}
 
-    const char* name() const override { return "DistanceFieldLCDTexture"; }
+    const char* name() const override { return "DistanceFieldLCDText"; }
 
     const Attribute* inPosition() const { return fInPosition; }
     const Attribute* inColor() const { return fInColor; }