diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-03-30 16:48:26 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 02:10:25 +0000 |
| commit | 4fc774060036ef04fbc1d92a018e42df8704ff50 (patch) | |
| tree | 22071209fee2d5d92c0ec9109bd9264519a5c3f2 /src/gpu/GrProcessorSet.h | |
| parent | 8517b4c87ee5b8c30aa9aa642fd3a7cbf9131688 (diff) | |
Respect xfer barriers in InstancedRendering::Op
Fixes a bug introduced when this Op stopped storing a GrPipeline.
Change-Id: I1a39814cebe18b321ea369f005bb7759f233cfe6
Reviewed-on: https://skia-review.googlesource.com/10804
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrProcessorSet.h')
| -rw-r--r-- | src/gpu/GrProcessorSet.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h index f63369c4d4..39ba0137b8 100644 --- a/src/gpu/GrProcessorSet.h +++ b/src/gpu/GrProcessorSet.h @@ -82,6 +82,7 @@ public: , fRequiresDstTexture(false) , fCanCombineOverlappedStencilAndCover(true) , fIgnoresInputColor(false) + , fRequiresBarrierBetweenOverlappingDraws(false) , fOutputCoverageType(static_cast<unsigned>(GrProcessorAnalysisCoverage::kNone)) , fOutputColorType(static_cast<unsigned>(ColorType::kUnknown)) , fInitialColorProcessorsToEliminate(0) {} @@ -126,6 +127,9 @@ public: bool canCombineOverlappedStencilAndCover() const { return fCanCombineOverlappedStencilAndCover; } + bool requiresBarrierBetweenOverlappingDraws() const { + return fRequiresBarrierBetweenOverlappingDraws; + } bool isCompatibleWithCoverageAsAlpha() const { return fCompatibleWithCoverageAsAlpha; } bool isInputColorIgnored() const { return fIgnoresInputColor; } GrProcessorAnalysisCoverage outputCoverage() const { @@ -163,10 +167,11 @@ public: PackedBool fCanCombineOverlappedStencilAndCover : 1; // These could be removed if we created the XP from the XPFactory when doing analysis. PackedBool fIgnoresInputColor : 1; + PackedBool fRequiresBarrierBetweenOverlappingDraws : 1; unsigned fOutputCoverageType : 2; unsigned fOutputColorType : 2; - unsigned fInitialColorProcessorsToEliminate : 32 - 11; + unsigned fInitialColorProcessorsToEliminate : 32 - 12; GrColor fInputColor; // This could be removed if we created the XP from the XPFactory when doing analysis. |