Centralize GrSamplerState key creation

rphilli · Skia Commit-Bot · commit f22c57ddcc8c · 2019-10-15T12:54:40.000Z
This also changes how the Metal backend computes its key (removing the # of mipMap levels) and removes the use of the # of mipMap levels when setting up the MTLSamplerDescriptor Change-Id: I29fedc7c7a12773f3efeea824bca98cbcde98be8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/248565 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrSamplerState.h b/src/gpu/GrSamplerState.h
@@ -62,6 +62,22 @@ class GrSamplerState {
 
     bool operator!=(const GrSamplerState& that) const { return !(*this == that); }
 
+    static uint8_t GenerateKey(const GrSamplerState& samplerState) {
+        const int kTileModeXShift = 2;
+        const int kTileModeYShift = 4;
+
+        SkASSERT(static_cast<int>(samplerState.filter()) <= 3);
+        uint8_t key = static_cast<uint8_t>(samplerState.filter());
+
+        SkASSERT(static_cast<int>(samplerState.wrapModeX()) <= 3);
+        key |= (static_cast<uint8_t>(samplerState.wrapModeX()) << kTileModeXShift);
+
+        SkASSERT(static_cast<int>(samplerState.wrapModeY()) <= 3);
+        key |= (static_cast<uint8_t>(samplerState.wrapModeY()) << kTileModeYShift);
+
+        return key;
+    }
+
 private:
     WrapMode fWrapModes[2];
     Filter fFilter;
diff --git a/src/gpu/mtl/GrMtlPipelineState.mm b/src/gpu/mtl/GrMtlPipelineState.mm
@@ -28,8 +28,7 @@
                                                      GrTexture* texture,
                                                      GrMtlGpu* gpu)
         : fTexture(static_cast<GrMtlTexture*>(texture)->mtlTexture()) {
-    uint32_t maxMipMapLevel = texture->texturePriv().maxMipMapLevel();
-    fSampler = gpu->resourceProvider().findOrCreateCompatibleSampler(state, maxMipMapLevel);
+    fSampler = gpu->resourceProvider().findOrCreateCompatibleSampler(state);
 }
 
 GrMtlPipelineState::GrMtlPipelineState(
diff --git a/src/gpu/mtl/GrMtlResourceProvider.h b/src/gpu/mtl/GrMtlResourceProvider.h
@@ -33,7 +33,7 @@ class GrMtlResourceProvider {
                                                                GrSurfaceOrigin);
 
     // Finds or creates a compatible MTLSamplerState based on the GrSamplerState.
-    GrMtlSampler* findOrCreateCompatibleSampler(const GrSamplerState&, uint32_t maxMipLevel);
+    GrMtlSampler* findOrCreateCompatibleSampler(const GrSamplerState&);
 
     id<MTLBuffer> getDynamicBuffer(size_t size, size_t* offset);
     void addBufferCompletionHandler(GrMtlCommandBuffer* cmdBuffer);
diff --git a/src/gpu/mtl/GrMtlResourceProvider.mm b/src/gpu/mtl/GrMtlResourceProvider.mm
@@ -59,12 +59,11 @@
     return depthStencilState;
 }
 
-GrMtlSampler* GrMtlResourceProvider::findOrCreateCompatibleSampler(const GrSamplerState& params,
-                                                                   uint32_t maxMipLevel) {
+GrMtlSampler* GrMtlResourceProvider::findOrCreateCompatibleSampler(const GrSamplerState& params) {
     GrMtlSampler* sampler;
-    sampler = fSamplers.find(GrMtlSampler::GenerateKey(params, maxMipLevel));
+    sampler = fSamplers.find(GrMtlSampler::GenerateKey(params));
     if (!sampler) {
-        sampler = GrMtlSampler::Create(fGpu, params, maxMipLevel);
+        sampler = GrMtlSampler::Create(fGpu, params);
         fSamplers.add(sampler);
     }
     SkASSERT(sampler);
diff --git a/src/gpu/mtl/GrMtlSampler.h b/src/gpu/mtl/GrMtlSampler.h
@@ -19,15 +19,15 @@ class GrMtlGpu;
 // A wrapper for a MTLSamplerState object with caching support.
 class GrMtlSampler : public SkRefCnt {
 public:
-    static GrMtlSampler* Create(const GrMtlGpu* gpu, const GrSamplerState&, uint32_t maxMipLevel);
+    static GrMtlSampler* Create(const GrMtlGpu* gpu, const GrSamplerState&);
     ~GrMtlSampler() { fMtlSamplerState = nil; }
 
     id<MTLSamplerState> mtlSampler() const { return fMtlSamplerState; }
 
     typedef uint32_t Key;
 
     // Helpers for hashing GrMtlSampler
-    static Key GenerateKey(const GrSamplerState&, uint32_t maxMipLevel);
+    static Key GenerateKey(const GrSamplerState&);
 
     static const Key& GetKey(const GrMtlSampler& sampler) { return sampler.fKey; }
     static uint32_t Hash(const Key& key) {
diff --git a/src/gpu/mtl/GrMtlSampler.mm b/src/gpu/mtl/GrMtlSampler.mm
@@ -40,8 +40,7 @@ static inline MTLSamplerAddressMode wrap_mode_to_mtl_sampler_address(
     SK_ABORT("Unknown wrap mode.");
 }
 
-GrMtlSampler* GrMtlSampler::Create(const GrMtlGpu* gpu, const GrSamplerState& samplerState,
-                                   uint32_t maxMipLevel) {
+GrMtlSampler* GrMtlSampler::Create(const GrMtlGpu* gpu, const GrSamplerState& samplerState) {
     static MTLSamplerMinMagFilter mtlMinMagFilterModes[] = {
         MTLSamplerMinMagFilterNearest,
         MTLSamplerMinMagFilterLinear,
@@ -62,35 +61,18 @@ static inline MTLSamplerAddressMode wrap_mode_to_mtl_sampler_address(
     samplerDesc.minFilter = mtlMinMagFilterModes[static_cast<int>(samplerState.filter())];
     samplerDesc.mipFilter = MTLSamplerMipFilterLinear;
     samplerDesc.lodMinClamp = 0.0f;
-    bool useMipMaps = GrSamplerState::Filter::kMipMap == samplerState.filter() && maxMipLevel > 0;
-    samplerDesc.lodMaxClamp = !useMipMaps ? 0.0f : (float)(maxMipLevel);
+    bool useMipMaps = GrSamplerState::Filter::kMipMap == samplerState.filter();
+    samplerDesc.lodMaxClamp = !useMipMaps ? 0.0f : 10000.0f;
     samplerDesc.maxAnisotropy = 1.0f;
     samplerDesc.normalizedCoordinates = true;
     if (@available(macOS 10.11, iOS 9.0, *)) {
         samplerDesc.compareFunction = MTLCompareFunctionNever;
     }
 
     return new GrMtlSampler([gpu->device() newSamplerStateWithDescriptor: samplerDesc],
-                            GenerateKey(samplerState, maxMipLevel));
+                            GenerateKey(samplerState));
 }
 
-GrMtlSampler::Key GrMtlSampler::GenerateKey(const GrSamplerState& samplerState,
-                                           uint32_t maxMipLevel) {
-    const int kTileModeXShift = 2;
-    const int kTileModeYShift = 4;
-    const int kMipLevelShift = 6;
-
-    SkASSERT(static_cast<int>(samplerState.filter()) <= 3);
-    Key samplerKey = static_cast<uint16_t>(samplerState.filter());
-
-    SkASSERT(static_cast<int>(samplerState.wrapModeX()) <= 3);
-    samplerKey |= (static_cast<uint16_t>(samplerState.wrapModeX()) << kTileModeXShift);
-
-    SkASSERT(static_cast<int>(samplerState.wrapModeY()) <= 3);
-    samplerKey |= (static_cast<uint16_t>(samplerState.wrapModeY()) << kTileModeYShift);
-
-    bool useMipMaps = GrSamplerState::Filter::kMipMap == samplerState.filter() && maxMipLevel > 0;
-    samplerKey |= (!useMipMaps ? 0 : (uint16_t) maxMipLevel) << kMipLevelShift;
-
-    return samplerKey;
+GrMtlSampler::Key GrMtlSampler::GenerateKey(const GrSamplerState& samplerState) {
+    return GrSamplerState::GenerateKey(samplerState);
 }
diff --git a/src/gpu/vk/GrVkSampler.cpp b/src/gpu/vk/GrVkSampler.cpp
@@ -126,18 +126,7 @@ void GrVkSampler::abandonGPUData() const {
 
 GrVkSampler::Key GrVkSampler::GenerateKey(const GrSamplerState& samplerState,
                                           const GrVkYcbcrConversionInfo& ycbcrInfo) {
-    const int kTileModeXShift = 2;
-    const int kTileModeYShift = 4;
-
-    SkASSERT(static_cast<int>(samplerState.filter()) <= 3);
-    uint8_t samplerKey = static_cast<uint16_t>(samplerState.filter());
-
-    SkASSERT(static_cast<int>(samplerState.wrapModeX()) <= 3);
-    samplerKey |= (static_cast<uint8_t>(samplerState.wrapModeX()) << kTileModeXShift);
-
-    SkASSERT(static_cast<int>(samplerState.wrapModeY()) <= 3);
-    samplerKey |= (static_cast<uint8_t>(samplerState.wrapModeY()) << kTileModeYShift);
-
-    return {samplerKey, GrVkSamplerYcbcrConversion::GenerateKey(ycbcrInfo)};
+    return { GrSamplerState::GenerateKey(samplerState),
+             GrVkSamplerYcbcrConversion::GenerateKey(ycbcrInfo) };
 }
 
diff --git a/src/gpu/vk/GrVkSampler.h b/src/gpu/vk/GrVkSampler.h
@@ -25,14 +25,14 @@ class GrVkSampler : public GrVkResource {
     const VkSampler* samplerPtr() const { return &fSampler; }
 
     struct Key {
-        Key(uint16_t samplerKey, const GrVkSamplerYcbcrConversion::Key& ycbcrKey) {
+        Key(uint8_t samplerKey, const GrVkSamplerYcbcrConversion::Key& ycbcrKey) {
             // We must memset here since the GrVkSamplerYcbcrConversion has a 64 bit value which may
             // force alignment padding to occur in the middle of the Key struct.
             memset(this, 0, sizeof(Key));
             fSamplerKey = samplerKey;
             fYcbcrKey = ycbcrKey;
         }
-        uint16_t                        fSamplerKey;
+        uint8_t                         fSamplerKey;
         GrVkSamplerYcbcrConversion::Key fYcbcrKey;
 
         bool operator==(const Key& that) const {

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@`
`28`	`28`	`GrTexture* texture,`
`29`	`29`	`GrMtlGpu* gpu)`
`30`	`30`	`: fTexture(static_cast<GrMtlTexture*>(texture)->mtlTexture()) {`
`31`		`- uint32_t maxMipMapLevel = texture->texturePriv().maxMipMapLevel();`
`32`		`- fSampler = gpu->resourceProvider().findOrCreateCompatibleSampler(state, maxMipMapLevel);`
	`31`	`+ fSampler = gpu->resourceProvider().findOrCreateCompatibleSampler(state);`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`GrMtlPipelineState::GrMtlPipelineState(`