diff options
| author | Yong He <yonghe@outlook.com> | 2024-12-18 11:33:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-18 11:33:55 -0800 |
| commit | ae04e604d43d169bcba7f24c8c23a0fdf4cbb483 (patch) | |
| tree | 899c872ec5cc5c6ccc27930ef6971a0baf018569 /source/slang/slang-emit-spirv.cpp | |
| parent | 41c627fd420a644f0ae86e36f4752e820e2d683c (diff) | |
Allow `Optional`, `Tuple` and `bool` to be used in varying input/output. (#5889)
* Allow `Optional` and `Tuple` to be used in varying input/output.
* Fix.
* format code
* Fix.
* Fix test.
* Fix.
* enhance test.
* Fix.
* format code
---------
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'source/slang/slang-emit-spirv.cpp')
| -rw-r--r-- | source/slang/slang-emit-spirv.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp index c618946ec..92fa507e0 100644 --- a/source/slang/slang-emit-spirv.cpp +++ b/source/slang/slang-emit-spirv.cpp @@ -1279,8 +1279,10 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex case AddressSpace::Uniform: return SpvStorageClassUniform; case AddressSpace::Input: + case AddressSpace::BuiltinInput: return SpvStorageClassInput; case AddressSpace::Output: + case AddressSpace::BuiltinOutput: return SpvStorageClassOutput; case AddressSpace::TaskPayloadWorkgroup: return SpvStorageClassTaskPayloadWorkgroupEXT; @@ -2688,7 +2690,10 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex IRBuilder builder(spvAsmBuiltinVar); builder.setInsertBefore(spvAsmBuiltinVar); auto varInst = getBuiltinGlobalVar( - builder.getPtrType(kIROp_PtrType, spvAsmBuiltinVar->getDataType(), AddressSpace::Input), + builder.getPtrType( + kIROp_PtrType, + spvAsmBuiltinVar->getDataType(), + AddressSpace::BuiltinInput), kind, spvAsmBuiltinVar); registerInst(spvAsmBuiltinVar, varInst); @@ -4214,7 +4219,9 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex { auto addrSpace = ptrType->getAddressSpace(); if (addrSpace != AddressSpace::Input && - addrSpace != AddressSpace::Output) + addrSpace != AddressSpace::Output && + addrSpace != AddressSpace::BuiltinInput && + addrSpace != AddressSpace::BuiltinOutput) continue; } } @@ -4995,7 +5002,7 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex if (!ptrType) return; auto addrSpace = ptrType->getAddressSpace(); - if (addrSpace == AddressSpace::Input) + if (addrSpace == AddressSpace::Input || addrSpace == AddressSpace::BuiltinInput) { if (isIntegralScalarOrCompositeType(ptrType->getValueType())) { |