commit 9b510a31561f5928584fc2837b86fa3ccd39e76e
author Brian Osman <brianosman@google.com> Fri Feb 26 14:29:39 2021 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 01 15:06:20 2021 +0000
tree a97a9c53e4112fe1d509d5ec73768380701af249
parent f1a937f141cbc233f65bfcd150ae48849ec3ef69

Reland "Reland "Remove GrProgramDesc::KeyHeader structure""

This is a reland of 202420e0147b02f963de761a903b2c430dfa0cec

Original change's description:
> Reland "Remove GrProgramDesc::KeyHeader structure"
>
> This is a reland of 4bcd58afbf1a1993e453231c575b47a0ae1ec24d
>
> Original change's description:
> > Remove GrProgramDesc::KeyHeader structure
> >
> > Instead, just fold all of this information into the key, like everything
> > else. The only value that was accessed elsewhere is the initial key
> > length. That doesn't need to be part of the key, so store it separately
> > in the GrProgramDesc.
> >
> > Removing this special case logic is just the first step in revising how
> > we assemble keys.
> >
> > Bug: skia:11372
> > Change-Id: I52eb76812045e1906797cb37e809cfd0b3332ef0
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376797
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Brian Osman <brianosman@google.com>
>
> Bug: skia:11372
> Change-Id: I2cdb49aee3537e54dad9af1f9b47cf1aed1aca21
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/376849
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>

Cq-Include-Trybots: luci.skia.skia.primary:Build-Win-MSVC-x86-Debug
Bug: skia:11372
Change-Id: I7cc94015d93fcb0365b6aa35daa1f9ea2facdd16
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377836
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/GrProgramDesc.h

diff --git a/src/gpu/GrProgramDesc.h b/src/gpu/GrProgramDesc.h
index 011edfd..7eaf880 100644
--- a/src/gpu/GrProgramDesc.h
+++ b/src/gpu/GrProgramDesc.h
@@ -22,7 +22,7 @@
  */
 class GrProgramDesc {
 public:
-    GrProgramDesc(const GrProgramDesc& other) : fKey(other.fKey) {}   // for SkLRUCache
+    GrProgramDesc(const GrProgramDesc& other) = default;
 
     bool isValid() const { return !fKey.empty(); }
 
@@ -41,6 +41,7 @@
         uint32_t keyLength = other.keyLength();
         fKey.reset(SkToInt(keyLength));
         memcpy(fKey.begin(), other.fKey.begin(), keyLength);
+        fInitialKeyLength = other.fInitialKeyLength;
         return *this;
     }
 
@@ -65,7 +66,7 @@
         return !(*this == other);
     }
 
-    uint32_t initialKeyLength() const { return this->header().fInitialKeyLength; }
+    uint32_t initialKeyLength() const { return fInitialKeyLength; }
 
 protected:
     friend class GrDawnCaps;
@@ -100,48 +101,11 @@
         return true;
     }
 
-    // TODO: this should be removed and converted to just data added to the key
-    struct KeyHeader {
-        // Set to uniquely identify any swizzling of the shader's output color(s).
-        uint16_t fWriteSwizzle;
-        uint8_t fColorFragmentProcessorCnt; // Can be packed into 4 bits if required.
-        uint8_t fCoverageFragmentProcessorCnt;
-        // Set to uniquely identify the rt's origin, or 0 if the shader does not require this info.
-        uint32_t fSurfaceOriginKey : 2;
-        uint32_t fProcessorFeatures : 1;
-        uint32_t fSnapVerticesToPixelCenters : 1;
-        uint32_t fHasPointSize : 1;
-        // This is the key size (in bytes) after core key construction. It doesn't include any
-        // portions added by the platform-specific backends.
-        uint32_t fInitialKeyLength : 27;
-    };
-    static_assert(sizeof(KeyHeader) == 8);
-
-    const KeyHeader& header() const { return *this->atOffset<KeyHeader, kHeaderOffset>(); }
-
-    template<typename T, size_t OFFSET> T* atOffset() {
-        return reinterpret_cast<T*>(reinterpret_cast<intptr_t>(fKey.begin()) + OFFSET);
-    }
-
-    template<typename T, size_t OFFSET> const T* atOffset() const {
-        return reinterpret_cast<const T*>(reinterpret_cast<intptr_t>(fKey.begin()) + OFFSET);
-    }
-
-    // The key, stored in fKey, is composed of two parts:
-    // 1. Header struct defined above.
-    // 2. A Backend specific payload which includes the per-processor keys.
-    enum KeyOffsets {
-        kHeaderOffset = 0,
-        kHeaderSize = SkAlign4(sizeof(KeyHeader)),
-        // This is the offset into the backend-specific part of the key, which includes
-        // per-processor keys.
-        kProcessorKeysOffset = kHeaderOffset + kHeaderSize,
-    };
-
     enum {
+        kHeaderSize            = 4,    // "header" in ::Build
         kMaxPreallocProcessors = 8,
         kIntsPerProcessor      = 4,    // This is an overestimate of the average effect key size.
-        kPreAllocSize = kHeaderOffset + kHeaderSize +
+        kPreAllocSize = kHeaderSize +
                         kMaxPreallocProcessors * sizeof(uint32_t) * kIntsPerProcessor,
     };
 
@@ -149,6 +113,7 @@
 
 private:
     SkSTArray<kPreAllocSize, uint8_t, true> fKey;
+    uint32_t fInitialKeyLength = 0;
 };
 
 #endif