From ebe8ddefc48478307d5f206cd3e40c41d28a36e3 Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 26 Sep 2023 23:56:06 -0700 Subject: Various SPIRV fixes. (#3231) * Various SPIRV fixes. - Geometry shader support (WIP). - Fix texture get dimension and load. - Fold global GetElement(MakeArray/MakeVector) insts. - Call spvopt to inline all functions. - Translate OpImageSubscript. - Emit struct member names and global variable names. - Fix lowering of OpBitNot -> OpNot, instead of OpBitReverse. * Fix test. * Fix geometry shader. * Fix geometry shader emit. * Add atomic Image access test. * Fix tests. * don't fail if spirv-opt fails. * Update comments. * Fix test. * Cleanups. * indentation --------- Co-authored-by: Yong He Co-authored-by: Ellie Hermaszewska --- source/slang/slang-ir-lower-buffer-element-type.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'source/slang/slang-ir-lower-buffer-element-type.cpp') diff --git a/source/slang/slang-ir-lower-buffer-element-type.cpp b/source/slang/slang-ir-lower-buffer-element-type.cpp index 1c02af82a..a5227ed68 100644 --- a/source/slang/slang-ir-lower-buffer-element-type.cpp +++ b/source/slang/slang-ir-lower-buffer-element-type.cpp @@ -184,7 +184,7 @@ namespace Slang IRBuilder builder(structType); builder.setInsertAfter(structType); auto func = builder.createFunc(); - auto funcType = builder.getFuncType(1, (IRType**)&structType, arrayType); + auto funcType = builder.getFuncType(1, (IRType**)&arrayType, structType); func->setFullType(funcType); builder.addNameHintDecoration(func, UnownedStringSlice("packStorage")); builder.setInsertInto(func); @@ -638,6 +638,23 @@ namespace Slang break; case kIROp_StructuredBufferGetDimensions: break; + case kIROp_Call: + { + // If we are calling a function with an l-value pointer from buffer access, + // we need to materialize the object as a local variable, and pass the address + // of the local variable to the function. + builder.setInsertBefore(user); + auto newLoad = builder.emitLoad(loweredElementTypeInfo.loweredType, ptrVal); + auto unpackedVal = builder.emitCallInst((IRType*)originalElementType, loweredElementTypeInfo.convertLoweredToOriginal, 1, &newLoad); + auto var = builder.emitVar((IRType*)originalElementType); + builder.emitStore(var, unpackedVal); + use->set(var); + builder.setInsertAfter(user); + auto newVal = builder.emitLoad(var); + auto packedVal = builder.emitCallInst((IRType*)loweredElementTypeInfo.loweredType, loweredElementTypeInfo.convertOriginalToLowered, 1, &newVal); + builder.emitStore(ptrVal, packedVal); + } + break; default: SLANG_UNREACHABLE("unhandled inst of a buffer/pointer value that needs storage lowering."); break; -- cgit v1.2.3