Revert "Add a "conservative raster" flag to GrPipeline and implement in Vulkan"
This reverts commit ee6b49b3af0b16aeb2076537a19b23d214e1fa15.
Reason for revert: I believe this is blocking the revert of Ethan's CL
Original change's description:
> Add a "conservative raster" flag to GrPipeline and implement in Vulkan
>
> This flag is not yet used or tested. Both will come next when we
> enable mixed sampled ccpr.
>
> Change-Id: Ic242010b1f0b8d81b83731960283e4231f301fd1
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/252258
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,csmartdalton@google.com
Change-Id: I01792817e7298470a3dc17e3687f1e8e0bc5d726
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/252918
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 8f3eaa9..a246c85 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -99,15 +99,7 @@
}
}
-void GrPipeline::genKey(GrProcessorKeyBuilder* b) const {
- // Currently kHWAntialias and kSnapVerticesToPixelCenters don't affect the pipeline key:
- // You can't disable msaa on vulkan or metal, and kSnapVerticesToPixelCenters is implemented
- // in a shader. Ideally, the client would not set kHWAntialias without
- // multisampleDisableSupport, but this is not currently the case.
- constexpr static uint32_t kFlagsMask = ~(uint32_t)(
- InputFlags::kHWAntialias | InputFlags::kSnapVerticesToPixelCenters);
- b->add32((uint32_t)fFlags & kFlagsMask);
-
+uint32_t GrPipeline::getBlendInfoKey() const {
const GrXferProcessor::BlendInfo& blendInfo = this->getXferProcessor().getBlendInfo();
static const uint32_t kBlendWriteShift = 1;
@@ -115,10 +107,10 @@
GR_STATIC_ASSERT(kLast_GrBlendCoeff < (1 << kBlendCoeffShift));
GR_STATIC_ASSERT(kFirstAdvancedGrBlendEquation - 1 < 4);
- uint32_t blendKey = blendInfo.fWriteColor;
- blendKey |= (blendInfo.fSrcBlend << kBlendWriteShift);
- blendKey |= (blendInfo.fDstBlend << (kBlendWriteShift + kBlendCoeffShift));
- blendKey |= (blendInfo.fEquation << (kBlendWriteShift + 2 * kBlendCoeffShift));
+ uint32_t key = blendInfo.fWriteColor;
+ key |= (blendInfo.fSrcBlend << kBlendWriteShift);
+ key |= (blendInfo.fDstBlend << (kBlendWriteShift + kBlendCoeffShift));
+ key |= (blendInfo.fEquation << (kBlendWriteShift + 2 * kBlendCoeffShift));
- b->add32(blendKey);
+ return key;
}