diff options
| author |  bsalomon <bsalomon@google.com> | 2015-07-08 07:55:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-08 07:55:59 -0700 |
| commit | f5179a4c490bc787190321bd8ffdb0e6a4efa9ac (patch) | |
| tree | 8b0d83f3f1d95963be2fa3657db6647d12f2be6c /src/gpu/GrDrawContext.cpp | |
| parent | cc97ece0583b1b1edb8f39d6dc32360d364a0171 (diff) | |
Makes GrPipelineInfo a class with query functions used by GrBatch subclasses.
Review URL: https://codereview.chromium.org/1213383005
Diffstat (limited to 'src/gpu/GrDrawContext.cpp')
| -rw-r--r-- | src/gpu/GrDrawContext.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp index f7d7e7bb09..b957b9124e 100644 --- a/src/gpu/GrDrawContext.cpp +++ b/src/gpu/GrDrawContext.cpp @@ -275,17 +275,16 @@ public: void initBatchTracker(const GrPipelineInfo& init) override { // Handle any color overrides - if (init.fColorIgnored) { + if (!init.readsColor()) { fGeoData[0].fColor = GrColor_ILLEGAL; - } else if (GrColor_ILLEGAL != init.fOverrideColor) { - fGeoData[0].fColor = init.fOverrideColor; } + init.getOverrideColorIfSet(&fGeoData[0].fColor); // setup batch properties - fBatch.fColorIgnored = init.fColorIgnored; + fBatch.fColorIgnored = !init.readsColor(); fBatch.fColor = fGeoData[0].fColor; - fBatch.fUsesLocalCoords = init.fUsesLocalCoords; - fBatch.fCoverageIgnored = init.fCoverageIgnored; + fBatch.fUsesLocalCoords = init.readsLocalCoords(); + fBatch.fCoverageIgnored = !init.readsCoverage(); } void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override { @@ -614,17 +613,16 @@ public: void initBatchTracker(const GrPipelineInfo& init) override { // Handle any color overrides - if (init.fColorIgnored) { + if (!init.readsColor()) { fGeoData[0].fColor = GrColor_ILLEGAL; - } else if (GrColor_ILLEGAL != init.fOverrideColor) { - fGeoData[0].fColor = init.fOverrideColor; } + init.getOverrideColorIfSet(&fGeoData[0].fColor); // setup batch properties - fBatch.fColorIgnored = init.fColorIgnored; + fBatch.fColorIgnored = !init.readsColor(); fBatch.fColor = fGeoData[0].fColor; - fBatch.fUsesLocalCoords = init.fUsesLocalCoords; - fBatch.fCoverageIgnored = init.fCoverageIgnored; + fBatch.fUsesLocalCoords = init.readsLocalCoords(); + fBatch.fCoverageIgnored = !init.readsCoverage(); } void generateGeometry(GrBatchTarget* batchTarget, const GrPipeline* pipeline) override { |