commit 4b18510931cffa230c21a0eca153226f5b809e17
author John Stiles <johnstiles@google.com> Fri Jun 04 16:27:00 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 04 21:00:57 2021 +0000
tree 0069c72a7271388923853f0a95a5486fb18fb228
parent a306dbf5dbad9ac1076a6808c57eb54706825534

Simplify GrPipeline::genKey.

This code contained lots of handcrafted bit-packing logic, but
GrProcessorKeyBuilder already knows how to pack bits for us.

Change-Id: Ia076524db99b5a56de08dc829600d32fecc1d456
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/415896
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrPipeline.cpp

diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
index 115de1e..e04d1c3 100644
--- a/src/gpu/GrPipeline.cpp
+++ b/src/gpu/GrPipeline.cpp
@@ -92,30 +92,20 @@
         // Ganesh will omit kHWAntialias regardless of multisampleDisableSupport.
         ignoredFlags |= InputFlags::kHWAntialias;
     }
-    b->add32((uint32_t)fFlags & ~(uint32_t)ignoredFlags);
+    b->add32((uint32_t)fFlags & ~(uint32_t)ignoredFlags, "flags");
 
     const GrXferProcessor::BlendInfo& blendInfo = this->getXferProcessor().getBlendInfo();
 
-    static constexpr uint32_t kBlendWriteShift = 1;
-    static constexpr uint32_t kBlendCoeffShift = 5;
-    static constexpr uint32_t kBlendEquationShift = 5;
-    static constexpr uint32_t kDstSampleTypeInputShift = 1;
-    static_assert(kLast_GrBlendCoeff < (1 << kBlendCoeffShift));
-    static_assert(kLast_GrBlendEquation < (1 << kBlendEquationShift));
-    static_assert(kBlendWriteShift +
-                  2 * kBlendCoeffShift +
-                  kBlendEquationShift +
-                  kDstSampleTypeInputShift <= 32);
+    static constexpr uint32_t kBlendCoeffSize = 5;
+    static constexpr uint32_t kBlendEquationSize = 5;
+    static_assert(kLast_GrBlendCoeff < (1 << kBlendCoeffSize));
+    static_assert(kLast_GrBlendEquation < (1 << kBlendEquationSize));
 
-    uint32_t blendKey = blendInfo.fWriteColor;
-    blendKey |= (blendInfo.fSrcBlend << kBlendWriteShift);
-    blendKey |= (blendInfo.fDstBlend << (kBlendWriteShift + kBlendCoeffShift));
-    blendKey |= (blendInfo.fEquation << (kBlendWriteShift + 2 * kBlendCoeffShift));
-    // Note that we use the general fDstSampleType here and not localDstSampleType()
-    blendKey |= ((fDstSampleType == GrDstSampleType::kAsInputAttachment)
-                 << (kBlendWriteShift + 2 * kBlendCoeffShift + kBlendEquationShift));
-
-    b->add32(blendKey);
+    b->addBool(blendInfo.fWriteColor, "writeColor");
+    b->addBits(kBlendCoeffSize, blendInfo.fSrcBlend, "srcBlend");
+    b->addBits(kBlendCoeffSize, blendInfo.fDstBlend, "dstBlend");
+    b->addBits(kBlendEquationSize, blendInfo.fEquation, "equation");
+    b->addBool(this->usesInputAttachment(), "inputAttach");
 }
 
 void GrPipeline::visitTextureEffects(