diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-07-10 09:05:57 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-10 09:05:57 -0700 |
| commit | 416e14f517f91e3d8b24ed99f5ca56fc5ec6ceee (patch) | |
| tree | ba7c01b14e7d31927985d0056a4dbf205f3fc93b | |
| parent | 5ce8b438da24b7a2f2de771d9276a6a6789236a2 (diff) | |
fix for valgrind issue
BUG=skia:
Review URL: https://codereview.chromium.org/1227933003
| -rw-r--r-- | src/gpu/GrAARectRenderer.cpp | 5 | ||||
| -rw-r--r-- | src/gpu/GrAtlasTextContext.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp index b0a0e51a68..64f587fce3 100644 --- a/src/gpu/GrAARectRenderer.cpp +++ b/src/gpu/GrAARectRenderer.cpp @@ -77,12 +77,13 @@ public: void initBatchTracker(const GrPipelineInfo& init) override { // Handle any color overrides if (!init.readsColor()) { - fBatch.fColor = GrColor_ILLEGAL; + fGeoData[0].fColor = GrColor_ILLEGAL; } - init.getOverrideColorIfSet(&fBatch.fColor); + init.getOverrideColorIfSet(&fGeoData[0].fColor); // setup batch properties fBatch.fColorIgnored = !init.readsColor(); + fBatch.fColor = fGeoData[0].fColor; fBatch.fUsesLocalCoords = init.readsLocalCoords(); fBatch.fCoverageIgnored = !init.readsCoverage(); fBatch.fCanTweakAlphaForCoverage = init.canTweakAlphaForCoverage(); diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp index f5bcefba76..73526ed4d5 100644 --- a/src/gpu/GrAtlasTextContext.cpp +++ b/src/gpu/GrAtlasTextContext.cpp @@ -1499,12 +1499,13 @@ public: void initBatchTracker(const GrPipelineInfo& init) override { // Handle any color overrides if (!init.readsColor()) { - fBatch.fColor = GrColor_ILLEGAL; + fGeoData[0].fColor = GrColor_ILLEGAL; } - init.getOverrideColorIfSet(&fBatch.fColor); + init.getOverrideColorIfSet(&fGeoData[0].fColor); // setup batch properties fBatch.fColorIgnored = !init.readsColor(); + fBatch.fColor = fGeoData[0].fColor; fBatch.fUsesLocalCoords = init.readsLocalCoords(); fBatch.fCoverageIgnored = !init.readsCoverage(); } |