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

Don't emit dead code in circle shader when not using distance vectors.

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2254103004

Review-Url: https://codereview.chromium.org/2254103004
This commit is contained in:
bsalomon 2016-08-18 08:32:27 -07:00 committed by Commit bot
parent f1c6cd7603
commit adf4edc4d6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gpu/GrOvalRenderer.cpp
View File

@ -145,19 +145,18 @@ private:
v.fsIn(), v.fsIn());
fragBuilder->codeAppend("float innerAlpha = clamp(distanceToInnerEdge, 0.0, 1.0);");
fragBuilder->codeAppend("edgeAlpha *= innerAlpha;");
} else {
fragBuilder->codeAppend("float distanceToInnerEdge = 0.0;");
}
if (args.fDistanceVectorName) {
const char* innerEdgeDistance = cgp.fStroke ? "distanceToInnerEdge" : "0.0";
fragBuilder->codeAppend ("if (d == 0.0) {"); // if on the center of the circle
fragBuilder->codeAppendf(" %s = vec4(1.0, 0.0, distanceToOuterEdge, "
"distanceToInnerEdge);", // no normalize
args.fDistanceVectorName);
"%s);", // no normalize
args.fDistanceVectorName, innerEdgeDistance);
fragBuilder->codeAppend ("} else {");
fragBuilder->codeAppendf(" %s = vec4(normalize(%s.xy), distanceToOuterEdge, "
"distanceToInnerEdge);",
args.fDistanceVectorName, v.fsIn());
"%s);",
args.fDistanceVectorName, v.fsIn(), innerEdgeDistance);
fragBuilder->codeAppend ("}");
}