AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

Review-Url: https://codereview.chromium.org/2340603003
This commit is contained in:
bsalomon 2016-09-15 07:29:52 -07:00 committed by Commit bot
parent 1dfec74d6b
commit 32d1e95ca5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/effects/GrDistanceFieldGeoProc.cpp
View File

@ -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);");

6
src/gpu/effects/GrDistanceFieldGeoProc.h
View File

@ -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; }