aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-12-27 16:49:04 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-01-02 15:00:30 +0000
commit8716b50aae949d5ad3af680c2530e9285f6491cc (patch)
treed75ac9a7ffc6d6562e806bc1a9f06d3ee6bc5c6a
parentadc78d52024fc546df61aff091a0d522a8fb95f2 (diff)
Update per-geo color after simplifying FPs in GrAtlasTextOp
FPs that were elided by analysis (eg SkColorShader) would previously have their impact on input color ignored when it came time to build vertex data for the run. Bug: skia:7297 Change-Id: Id5d741ccf3607c2f34b8b01bb3a2289fa22d5c11 Reviewed-on: https://skia-review.googlesource.com/89640 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
-rw-r--r--src/gpu/ops/GrAtlasTextOp.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index c3698b992f..7c1d044469 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -97,6 +97,8 @@ GrDrawOp::RequiresDstTexture GrAtlasTextOp::finalize(const GrCaps& caps,
break;
}
auto analysis = fProcessors.finalize(color, coverage, clip, false, caps, dstIsClamped, &fColor);
+ // We need to update the per-geo color after analysis, too. This one is sent per-vertex.
+ fGeoData[0].fColor = fColor;
fUsesLocalCoords = analysis.usesLocalCoords();
fCanCombineOnTouchOrOverlap =
!analysis.requiresDstTexture() &&