[WebGPU] Use UnsignedWithZeroKeyHashTraits in m_cachedBindGroupLayout…

…s instead of adding 1 to the key https://bugs.webkit.org/show_bug.cgi?id=257068 <rdar://problem/109590315> Reviewed by Dan Glastonbury. This is exactly what UnsignedWithZeroKeyHashTraits is meant for. * Source/WebGPU/WebGPU/ComputePipeline.h: * Source/WebGPU/WebGPU/ComputePipeline.mm: (WebGPU::ComputePipeline::getBindGroupLayout): * Source/WebGPU/WebGPU/RenderPipeline.h: * Source/WebGPU/WebGPU/RenderPipeline.mm: (WebGPU::RenderPipeline::getBindGroupLayout): Canonical link: https://commits.webkit.org/264304@main
WebKit · May 21, 2023 · 597aa39 · 597aa39
1 parent 25578b6
commit 597aa39
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Source/WebGPU/WebGPU/ComputePipeline.h b/Source/WebGPU/WebGPU/ComputePipeline.h
@@ -28,6 +28,8 @@
 #import "BindGroupLayout.h"
 
 #import <wtf/FastMalloc.h>
+#import <wtf/HashMap.h>
+#import <wtf/HashTraits.h>
 #import <wtf/Ref.h>
 #import <wtf/RefCounted.h>
 
@@ -81,7 +83,7 @@ class ComputePipeline : public WGPUComputePipelineImpl, public RefCounted<Comput
 #endif
     const PipelineLayout *m_pipelineLayout { nullptr };
     const Ref<Device> m_device;
-    HashMap<uint32_t, Ref<BindGroupLayout>> m_cachedBindGroupLayouts;
+    HashMap<uint32_t, Ref<BindGroupLayout>, WTF::DefaultHash<uint32_t>, WTF::UnsignedWithZeroKeyHashTraits<uint32_t>> m_cachedBindGroupLayouts;
     const MTLSize m_threadsPerThreadgroup;
 };
 

diff --git a/Source/WebGPU/WebGPU/ComputePipeline.mm b/Source/WebGPU/WebGPU/ComputePipeline.mm
@@ -138,7 +138,7 @@ static MTLSize metalSize(auto workgroupSize)
     if (m_pipelineLayout)
         return const_cast<BindGroupLayout*>(&m_pipelineLayout->bindGroupLayout(groupIndex));
 
-    auto it = m_cachedBindGroupLayouts.find(groupIndex + 1);
+    auto it = m_cachedBindGroupLayouts.find(groupIndex);
     if (it != m_cachedBindGroupLayouts.end())
         return it->value.ptr();
 
@@ -159,7 +159,7 @@ static MTLSize metalSize(auto workgroupSize)
     bindGroupLayoutDescriptor.entryCount = entries.size();
     bindGroupLayoutDescriptor.entries = entries.size() ? &entries[0] : nullptr;
     auto bindGroupLayout = m_device->createBindGroupLayout(bindGroupLayoutDescriptor);
-    m_cachedBindGroupLayouts.add(groupIndex + 1, bindGroupLayout);
+    m_cachedBindGroupLayouts.add(groupIndex, bindGroupLayout);
 
     return bindGroupLayout.ptr();
 #else

diff --git a/Source/WebGPU/WebGPU/RenderPipeline.h b/Source/WebGPU/WebGPU/RenderPipeline.h
@@ -27,6 +27,7 @@
 
 #import <wtf/FastMalloc.h>
 #import <wtf/HashMap.h>
+#import <wtf/HashTraits.h>
 #import <wtf/Ref.h>
 #import <wtf/RefCounted.h>
 
@@ -77,7 +78,7 @@ class RenderPipeline : public WGPURenderPipelineImpl, public RefCounted<RenderPi
     const id<MTLRenderPipelineState> m_renderPipelineState { nil };
 
     const Ref<Device> m_device;
-    HashMap<uint32_t, Ref<BindGroupLayout>> m_cachedBindGroupLayouts;
+    HashMap<uint32_t, Ref<BindGroupLayout>, WTF::DefaultHash<uint32_t>, WTF::UnsignedWithZeroKeyHashTraits<uint32_t>> m_cachedBindGroupLayouts;
     MTLPrimitiveType m_primitiveType;
     std::optional<MTLIndexType> m_indexType;
     MTLWinding m_frontFace;

diff --git a/Source/WebGPU/WebGPU/RenderPipeline.mm b/Source/WebGPU/WebGPU/RenderPipeline.mm
@@ -526,7 +526,7 @@ static void populateStencilOperation(MTLStencilDescriptor *mtlStencil, const WGP
     if (m_pipelineLayout)
         return const_cast<BindGroupLayout*>(&m_pipelineLayout->bindGroupLayout(groupIndex));
 
-    auto it = m_cachedBindGroupLayouts.find(groupIndex + 1);
+    auto it = m_cachedBindGroupLayouts.find(groupIndex);
     if (it != m_cachedBindGroupLayouts.end())
         return it->value.ptr();
 
@@ -557,7 +557,7 @@ static void populateStencilOperation(MTLStencilDescriptor *mtlStencil, const WGP
     bindGroupLayoutDescriptor.entryCount = entries.size();
     bindGroupLayoutDescriptor.entries = entries.size() ? &entries[0] : nullptr;
     auto bindGroupLayout = m_device->createBindGroupLayout(bindGroupLayoutDescriptor);
-    m_cachedBindGroupLayouts.add(groupIndex + 1, bindGroupLayout);
+    m_cachedBindGroupLayouts.add(groupIndex, bindGroupLayout);
 
     return WebGPU::releaseToAPI(WTFMove(bindGroupLayout));
 #else