summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorJulius Ikkala <julius.ikkala@gmail.com>2025-01-16 06:35:11 +0200
committerGitHub <noreply@github.com>2025-01-15 20:35:11 -0800
commit80a330f0cae4d164eb6b2fe513bde2cf9a3b01c1 (patch)
tree676a408a04044c5274236833d5f68e7d3b1932e7 /source
parent9b977e59cf786bbb000b3b868b126c2b9a17d3f3 (diff)
Implement AnyValue marshalling for 8-bit integers (#6059)
* Implement anyvalue marshalling for 8-bit integers * Fix missing offset from int8/uint8 case * Disable anyvalue 8-bit test for DXIL Because it doesn't support 8-bit values anyway. --------- Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'source')
-rw-r--r--source/slang/slang-ir-any-value-marshalling.cpp49
1 files changed, 46 insertions, 3 deletions
diff --git a/source/slang/slang-ir-any-value-marshalling.cpp b/source/slang/slang-ir-any-value-marshalling.cpp
index 673a3d168..d1be60035 100644
--- a/source/slang/slang-ir-any-value-marshalling.cpp
+++ b/source/slang/slang-ir-any-value-marshalling.cpp
@@ -375,6 +375,25 @@ struct AnyValueMarshallingContext
}
case kIROp_Int8Type:
case kIROp_UInt8Type:
+ if (fieldOffset < static_cast<uint32_t>(anyValInfo->fieldKeys.getCount()))
+ {
+ auto srcVal = builder->emitLoad(concreteVar);
+ srcVal = builder->emitCast(builder->getType(kIROp_UIntType), srcVal);
+ auto dstAddr = builder->emitFieldAddress(
+ uintPtrType,
+ anyValueVar,
+ anyValInfo->fieldKeys[fieldOffset]);
+ auto dstVal = builder->emitLoad(dstAddr);
+ dstVal = builder->emitBitfieldInsert(
+ dstVal->getFullType(),
+ dstVal,
+ srcVal,
+ builder->getIntValue(builder->getUIntType(), 8 * intraFieldOffset),
+ builder->getIntValue(builder->getUIntType(), 8));
+ builder->emitStore(dstAddr, dstVal);
+ }
+ advanceOffset(1);
+ break;
case kIROp_UInt64Type:
case kIROp_Int64Type:
case kIROp_DoubleType:
@@ -600,11 +619,35 @@ struct AnyValueMarshallingContext
advanceOffset(2);
break;
}
+ case kIROp_Int8Type:
+ case kIROp_UInt8Type:
+ if (fieldOffset < static_cast<uint32_t>(anyValInfo->fieldKeys.getCount()))
+ {
+ auto srcAddr = builder->emitFieldAddress(
+ uintPtrType,
+ anyValueVar,
+ anyValInfo->fieldKeys[fieldOffset]);
+ auto srcVal = builder->emitLoad(srcAddr);
+ srcVal = builder->emitBitfieldExtract(
+ srcVal->getFullType(),
+ srcVal,
+ builder->getIntValue(builder->getUIntType(), 8 * intraFieldOffset),
+ builder->getIntValue(builder->getUIntType(), 8));
+ if (dataType->getOp() == kIROp_Int8Type)
+ {
+ srcVal = builder->emitCast(builder->getType(kIROp_Int8Type), srcVal);
+ }
+ else
+ {
+ srcVal = builder->emitCast(builder->getType(kIROp_UInt8Type), srcVal);
+ }
+ builder->emitStore(concreteVar, srcVal);
+ }
+ advanceOffset(1);
+ break;
case kIROp_UInt64Type:
case kIROp_Int64Type:
case kIROp_DoubleType:
- case kIROp_Int8Type:
- case kIROp_UInt8Type:
case kIROp_PtrType:
#if SLANG_PTR_IS_64
case kIROp_IntPtrType:
@@ -832,7 +875,7 @@ SlangInt _getAnyValueSizeRaw(IRType* type, SlangInt offset)
return alignUp(offset, 2) + 2;
case kIROp_UInt8Type:
case kIROp_Int8Type:
- return -1;
+ return offset + 1;
case kIROp_VectorType:
{
auto vectorType = static_cast<IRVectorType*>(type);