summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-emit-spirv.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang/slang-emit-spirv.cpp')
-rw-r--r--source/slang/slang-emit-spirv.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp
index 6b42896d0..d6f4ac176 100644
--- a/source/slang/slang-emit-spirv.cpp
+++ b/source/slang/slang-emit-spirv.cpp
@@ -1847,10 +1847,22 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex
IRSizeAndAlignment sizeAndAlignment;
uint32_t stride;
- getNaturalSizeAndAlignment(
- m_targetProgram->getOptionSet(),
- valueType,
- &sizeAndAlignment);
+ if (auto layout = valueType->findDecoration<IRSizeAndAlignmentDecoration>())
+ {
+ auto rule = IRTypeLayoutRules::get(layout->getLayoutName());
+ getSizeAndAlignment(
+ m_targetProgram->getOptionSet(),
+ rule,
+ valueType,
+ &sizeAndAlignment);
+ }
+ else
+ {
+ getNaturalSizeAndAlignment(
+ m_targetProgram->getOptionSet(),
+ valueType,
+ &sizeAndAlignment);
+ }
uint64_t valueSize = sizeAndAlignment.size;
// Any unsized data type (e.g. struct or array) will have size of