From 0470ea05a42d6c3f35d81a433fefdd440500cdbd Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 24 Aug 2023 16:32:33 -0700 Subject: Misc. SPIRV Fixes, Part 2. (#3147) * Misc. SPIRV Fixes, Part 2. * Fix up. * Fix. * Add system smenatic values. * 16 bit int and floats, matrix/vector reshape, bool ops. * Fix. * Fix. * Allow push constant entry point params. * entrypoint params. * swizzleSet and swizzledStore. * packoffset. * string hash. * Fix. * Matrix arithmetics. --------- Co-authored-by: Yong He --- source/slang/slang-ir-any-value-marshalling.cpp | 35 +++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'source/slang/slang-ir-any-value-marshalling.cpp') diff --git a/source/slang/slang-ir-any-value-marshalling.cpp b/source/slang/slang-ir-any-value-marshalling.cpp index ed7818dbf..200f8bc55 100644 --- a/source/slang/slang-ir-any-value-marshalling.cpp +++ b/source/slang/slang-ir-any-value-marshalling.cpp @@ -241,7 +241,6 @@ namespace Slang { case kIROp_IntType: case kIROp_FloatType: - case kIROp_BoolType: #if SLANG_PTR_IS_32 case kIROp_IntPtrType: #endif @@ -260,6 +259,23 @@ namespace Slang advanceOffset(4); break; } + case kIROp_BoolType: + { + ensureOffsetAt4ByteBoundary(); + if (fieldOffset < static_cast(anyValInfo->fieldKeys.getCount())) + { + auto srcVal = builder->emitLoad(concreteVar); + IRInst* args[] = {srcVal, builder->getIntValue(builder->getUIntType(), 1), builder->getIntValue(builder->getUIntType(), 0) }; + auto dstVal = builder->emitIntrinsicInst(builder->getUIntType(), kIROp_Select, 3, args); + auto dstAddr = builder->emitFieldAddress( + uintPtrType, + anyValueVar, + anyValInfo->fieldKeys[fieldOffset]); + builder->emitStore(dstAddr, dstVal); + } + advanceOffset(4); + break; + } case kIROp_UIntType: #if SLANG_PTR_IS_32 case kIROp_UIntPtrType: @@ -416,7 +432,6 @@ namespace Slang { case kIROp_IntType: case kIROp_FloatType: - case kIROp_BoolType: { ensureOffsetAt4ByteBoundary(); if (fieldOffset < static_cast(anyValInfo->fieldKeys.getCount())) @@ -432,6 +447,22 @@ namespace Slang advanceOffset(4); break; } + case kIROp_BoolType: + { + ensureOffsetAt4ByteBoundary(); + if (fieldOffset < static_cast(anyValInfo->fieldKeys.getCount())) + { + auto srcAddr = builder->emitFieldAddress( + uintPtrType, + anyValueVar, + anyValInfo->fieldKeys[fieldOffset]); + auto srcVal = builder->emitLoad(srcAddr); + srcVal = builder->emitNeq(srcVal, builder->getIntValue(builder->getUIntType(), 0)); + builder->emitStore(concreteVar, srcVal); + } + advanceOffset(4); + break; + } case kIROp_UIntType: { ensureOffsetAt4ByteBoundary(); -- cgit v1.2.3