From 4485cf3eaf142cfd5f8470e86739acc67d4e12ea Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 6 Mar 2025 14:26:34 -0800 Subject: Update SPIRV-Tools and fix new validation errors. (#6511) * Update SPIRV-Tools and fix new validation errors. * Implement pointers for glsl target. * Reworked packStorage/unpackStorage code gen to operate on pointers rather than values. --- source/slang/slang-ir-layout.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/slang/slang-ir-layout.cpp') diff --git a/source/slang/slang-ir-layout.cpp b/source/slang/slang-ir-layout.cpp index 558877aaf..c60b39248 100644 --- a/source/slang/slang-ir-layout.cpp +++ b/source/slang/slang-ir-layout.cpp @@ -186,8 +186,8 @@ static Result _calcSizeAndAlignment( builder.getIntValue(intType, (IRIntegerValue)rules->ruleName), builder.getIntValue(intType, fieldOffset)); } - - structLayout.size += fieldTypeLayout.size; + if (!seenFinalUnsizedArrayField) + structLayout.size += fieldTypeLayout.size; offset = structLayout.size; if (as(field->getFieldType()) || as(field->getFieldType()) || @@ -340,7 +340,6 @@ static Result _calcSizeAndAlignment( case kIROp_NativePtrType: case kIROp_ComPtrType: case kIROp_NativeStringType: - case kIROp_HLSLConstBufferPointerType: case kIROp_RaytracingAccelerationStructureType: { *outSizeAndAlignment = IRSizeAndAlignment(kPointerSize, kPointerSize); -- cgit v1.2.3