summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-ir-layout.cpp
diff options
context:
space:
mode:
authorkaizhangNV <149626564+kaizhangNV@users.noreply.github.com>2024-03-27 13:30:34 -0700
committerGitHub <noreply@github.com>2024-03-27 13:30:34 -0700
commit56928794d0800824dc91e150cb345b5fec24d930 (patch)
tree63f07c0dfad1eb998a683f089755280fde1cc73b /source/slang/slang-ir-layout.cpp
parentb346a9333ae6d09f053db60b3006e6e074332ac2 (diff)
Fix incorrect SPV stride for unsized array (#3837)
* Fix incorrect SPV stride for unsized array (#3825) In '-emit-spirv-directly' mode, slang generates the stride 0 for unsized array in `OpDecorate` instructions. For unsized array, the stride is invalid, but we need to provide a non-zero value to pass the spirv validator. * Decorate struct with unsized array field as 'Block' For the struct having unsized array fields, it has to be decorated as "Block", otherwise it will fails the spirv-val. So we add a check at in 'emitGlobalInst' when emitting spirv for 'kIROp_StructType', where if there is unsized array field inside the struct, emit a decorate instruction for above purpose. * Update decoration for kIROp_SizeAndAlignmentDecoration When add a decoration node for kIROp_SizeAndAlignmentDecoration, we implicitly convert the 64 bit size to 32 bit. In most cases, this should not be a problem because we won't have that large data type. However, we use 64-bit -1 to represent the size of unsized-array, so in that case, the conversion will change the size to 0, which is incorrect. So change that decoration to use 64-bit size. --------- Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'source/slang/slang-ir-layout.cpp')
-rw-r--r--source/slang/slang-ir-layout.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/slang/slang-ir-layout.cpp b/source/slang/slang-ir-layout.cpp
index 313761d2c..3ac022f68 100644
--- a/source/slang/slang-ir-layout.cpp
+++ b/source/slang/slang-ir-layout.cpp
@@ -363,11 +363,12 @@ Result getSizeAndAlignment(CompilerOptionSet& optionSet, IRTypeLayoutRules* rule
IRBuilder builder(module);
auto intType = builder.getIntType();
+ auto int64Type = builder.getInt64Type();
builder.addDecoration(
type,
kIROp_SizeAndAlignmentDecoration,
builder.getIntValue(intType, (IRIntegerValue)rules->ruleName),
- builder.getIntValue(intType, sizeAndAlignment.size),
+ builder.getIntValue(int64Type, sizeAndAlignment.size),
builder.getIntValue(intType, sizeAndAlignment.alignment));
}