diff options
| author | kaizhangNV <149626564+kaizhangNV@users.noreply.github.com> | 2024-07-23 23:44:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-23 21:44:47 -0700 |
| commit | 5339f613cefd5d048bd8fba0a1f275184a229b96 (patch) | |
| tree | dbbb4c1c3febacae78d06b9184ed3da57c6ad1a0 /source | |
| parent | 72f7ea60461df520668de0947f350b85219db577 (diff) | |
Allow only specific spv storage classes for binding decoration (#4713)
* Allow only specific spv storage classes for binding decoration
In
https://registry.khronos.org/vulkan/specs/1.3/html/chap37.html#VUID-StandaloneSpirv-DescriptorSet-06491
it states that
If a variable is decorated by DescriptorSet or Binding, the Storage
class must be UniformConstant, Uniform and StorageBuffer.
So apply this rule to our emit-spirv logic.
* Add a unit test
* Address few comments
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/slang-emit-spirv.cpp | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp index 28d66497d..f5bb21c00 100644 --- a/source/slang/slang-emit-spirv.cpp +++ b/source/slang/slang-emit-spirv.cpp @@ -1791,6 +1791,32 @@ struct SPIRVEmitContext } } + static SpvStorageClass getSpvStorageClass(IRPtrTypeBase* ptrType) + { + SpvStorageClass storageClass = SpvStorageClassFunction; + if (ptrType && ptrType->hasAddressSpace()) + { + storageClass = (SpvStorageClass)ptrType->getAddressSpace(); + } + return storageClass; + } + + // https://registry.khronos.org/vulkan/specs/1.3/html/chap37.html#VUID-StandaloneSpirv-DescriptorSet-06491 + // Only UniformConstant, Uniform or StorageBuffer storage class are allowed to be decorated with descriptor + // set or binding. + static inline bool isBindingAllowed(SpvStorageClass storageClass) + { + switch(storageClass) + { + case SpvStorageClassUniformConstant: + case SpvStorageClassUniform: + case SpvStorageClassStorageBuffer: + return true; + default: + return false; + } + } + SpvCapability getImageFormatCapability(SpvImageFormat format) { switch (format) @@ -2137,6 +2163,10 @@ struct SPIRVEmitContext void emitVarLayout(IRInst* var, SpvInst* varInst, IRVarLayout* layout) { + auto dataType = as<IRPtrTypeBase>(var->getDataType()); + SpvStorageClass storageClass = getSpvStorageClass(dataType); + + bool isBindingDecorationAllowed = isBindingAllowed(storageClass); bool needDefaultSetBindingDecoration = false; bool hasExplicitSetBinding = false; bool isDescirptorSetDecorated = false; @@ -2196,11 +2226,15 @@ struct SPIRVEmitContext case LayoutResourceKind::UnorderedAccess: case LayoutResourceKind::SamplerState: case LayoutResourceKind::DescriptorTableSlot: + if (!isBindingDecorationAllowed) + break; + emitOpDecorateBinding( getSection(SpvLogicalSectionID::Annotations), nullptr, varInst, SpvLiteralInteger::from32(int32_t(index))); + if (!isDescirptorSetDecorated) { if (space) @@ -2219,7 +2253,7 @@ struct SPIRVEmitContext } break; case LayoutResourceKind::RegisterSpace: - if (!isDescirptorSetDecorated) + if (!isDescirptorSetDecorated && isBindingDecorationAllowed) { emitOpDecorateDescriptorSet( getSection(SpvLogicalSectionID::Annotations), @@ -4344,11 +4378,8 @@ struct SPIRVEmitContext { auto ptrType = as<IRPtrTypeBase>(inst->getDataType()); SLANG_ASSERT(ptrType); - SpvStorageClass storageClass = SpvStorageClassFunction; - if (ptrType->hasAddressSpace()) - { - storageClass = (SpvStorageClass)ptrType->getAddressSpace(); - } + SpvStorageClass storageClass = getSpvStorageClass(ptrType); + auto varSpvInst = emitOpVariable(parent, inst, inst->getFullType(), storageClass); maybeEmitName(varSpvInst, inst); maybeEmitPointerDecoration(varSpvInst, inst); |
