Respect the bind point supplied to vkCmdPushDescriptorSets

KhronosGroup · May 12, 2023 · 9612d76 · 9612d76
1 parent fbaba84
commit 9612d76
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 87 deletions.
diff --git a/MoltenVK/MoltenVK/Commands/MVKCmdPipeline.mm b/MoltenVK/MoltenVK/Commands/MVKCmdPipeline.mm
@@ -393,7 +393,7 @@
 }
 
 void MVKCmdPushDescriptorSet::encode(MVKCommandEncoder* cmdEncoder) {
- _pipelineLayout->pushDescriptorSet(cmdEncoder, _descriptorWrites.contents(), _set);
+ _pipelineLayout->pushDescriptorSet(cmdEncoder, _pipelineBindPoint, _descriptorWrites.contents(), _set);
 }
 
 MVKCmdPushDescriptorSet::~MVKCmdPushDescriptorSet() {

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.h b/MoltenVK/MoltenVK/GPUObjects/MVKDescriptor.h
@@ -120,13 +120,15 @@ class MVKDescriptorSetLayoutBinding : public MVKBaseDeviceObject {
 
  /** Encodes the descriptors in the descriptor set that are specified by this layout, */
  void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSet* descSet,
  MVKShaderResourceBinding& dslMTLRezIdxOffsets,
  MVKArrayRef<uint32_t> dynamicOffsets,
  uint32_t& dynamicOffsetIndex);
 
  /** Encodes this binding layout and the specified descriptor on the specified command encoder immediately. */
  void push(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  uint32_t& dstArrayElement,
  uint32_t& descriptorCount,
  uint32_t& descriptorsPushed,
@@ -207,6 +209,7 @@ class MVKDescriptor : public MVKBaseObject {
 
  /** Encodes this descriptor (based on its layout binding index) on the the command encoder. */
  virtual void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSetLayoutBinding* mvkDSLBind,
  uint32_t elementIndex,
  bool stages[],
@@ -273,6 +276,7 @@ class MVKBufferDescriptor : public MVKDescriptor {
 
 public:
  void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSetLayoutBinding* mvkDSLBind,
  uint32_t elementIndex,
  bool stages[],
@@ -362,6 +366,7 @@ class MVKInlineUniformBlockDescriptor : public MVKDescriptor {
  VkDescriptorType getDescriptorType() override { return VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; }
 
  void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSetLayoutBinding* mvkDSLBind,
  uint32_t elementIndex,
  bool stages[],
@@ -411,6 +416,7 @@ class MVKImageDescriptor : public MVKDescriptor {
 
 public:
  void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSetLayoutBinding* mvkDSLBind,
  uint32_t elementIndex,
  bool stages[],
@@ -491,6 +497,7 @@ class MVKSamplerDescriptorMixin {
 
 protected:
  void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSetLayoutBinding* mvkDSLBind,
  uint32_t elementIndex,
  bool stages[],
@@ -538,6 +545,7 @@ class MVKSamplerDescriptor : public MVKDescriptor, public MVKSamplerDescriptorMi
  VkDescriptorType getDescriptorType() override { return VK_DESCRIPTOR_TYPE_SAMPLER; }
 
  void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSetLayoutBinding* mvkDSLBind,
  uint32_t elementIndex,
  bool stages[],
@@ -585,6 +593,7 @@ class MVKCombinedImageSamplerDescriptor : public MVKImageDescriptor, public MVKS
  VkDescriptorType getDescriptorType() override { return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER; }
 
  void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSetLayoutBinding* mvkDSLBind,
  uint32_t elementIndex,
  bool stages[],
@@ -630,6 +639,7 @@ class MVKTexelBufferDescriptor : public MVKDescriptor {
 
 public:
  void bind(MVKCommandEncoder* cmdEncoder,
+ VkPipelineBindPoint pipelineBindPoint,
  MVKDescriptorSetLayoutBinding* mvkDSLBind,
  uint32_t elementIndex,
  bool stages[],