From 9a23a9aab3721828526c921db1e779008e133e8f Mon Sep 17 00:00:00 2001 From: Yong He Date: Sat, 8 Jun 2024 05:12:49 -0700 Subject: SPIRV `Block` decoration fixes. (#4303) * SPIRV `Block` decoration fixes. - SPIRV does not allow duplicate `Block` decorations. So we shouldn't be generating them. - Also fixes duplication of OpName. - SPIRV and HLSL do not allow ConstantBuffer with trailing unsized arrays. Added a check in the front-end against such code. * Convert failing cross-compile tests to filecheck. --------- Co-authored-by: Jay Kwak <82421531+jkwak-work@users.noreply.github.com> --- source/slang/slang-emit-spirv.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/slang/slang-emit-spirv.cpp') diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp index 769e36861..1ef3a31e0 100644 --- a/source/slang/slang-emit-spirv.cpp +++ b/source/slang/slang-emit-spirv.cpp @@ -1481,7 +1481,8 @@ struct SPIRVEmitContext if (structSize >= (uint64_t)IRSizeAndAlignment::kIndeterminateSize) { IRBuilder builder(inst); - if (isSpirv14OrLater() || !inst->findDecorationImpl(kIROp_SPIRVBufferBlockDecoration)) + if ((isSpirv14OrLater() || !inst->findDecorationImpl(kIROp_SPIRVBufferBlockDecoration)) + && !inst->findDecorationImpl(kIROp_SPIRVBlockDecoration)) { auto decoration = builder.addDecoration(inst, kIROp_SPIRVBlockDecoration); emitDecoration(getID(spvStructType), decoration); @@ -2308,7 +2309,6 @@ struct SPIRVEmitContext maybeEmitPointerDecoration(varInst, param); if (auto layout = getVarLayout(param)) emitVarLayout(param, varInst, layout); - maybeEmitName(varInst, param); emitDecorations(param, getID(varInst)); return varInst; } @@ -2332,7 +2332,6 @@ struct SPIRVEmitContext maybeEmitPointerDecoration(varInst, globalVar); if(layout) emitVarLayout(globalVar, varInst, layout); - maybeEmitName(varInst, globalVar); emitDecorations(globalVar, getID(varInst)); return varInst; } -- cgit v1.2.3