diff options
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/slang-emit-c-like.cpp | 11 | ||||
| -rw-r--r-- | source/slang/slang-ir.cpp | 12 | ||||
| -rw-r--r-- | source/slang/slang-type-layout.cpp | 16 | ||||
| -rw-r--r-- | source/slang/slang.natvis | 22 |
4 files changed, 48 insertions, 13 deletions
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp index 1b0fe7c44..47c584251 100644 --- a/source/slang/slang-emit-c-like.cpp +++ b/source/slang/slang-emit-c-like.cpp @@ -1794,6 +1794,17 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO } break; + case kIROp_WrapExistential: + { + // Normally `WrapExistential` shouldn't exist in user code at this point. + // The only exception is when the user is calling a stdlib generic + // function that has an existential type argument, for example + // `StructuredBuffer<ISomething>.Load()`. + // We can safely ignore the `wrapExistential` operation in this case. + emitOperand(inst->getOperand(0), outerPrec); + } + break; + case kIROp_Select: { diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp index 1f68623bb..90d0181f7 100644 --- a/source/slang/slang-ir.cpp +++ b/source/slang/slang-ir.cpp @@ -6019,3 +6019,15 @@ namespace Slang } } // namespace Slang +#if SLANG_VC +#ifdef _DEBUG +// Natvis sometimes cannot find enum values. +// Export symbols for them to make sure natvis works correctly when debugging external projects. +SLANG_API const int __SlangIROpNameHint = Slang::kIROp_NameHintDecoration; +SLANG_API const int __SlangIROpExport = Slang::kIROp_ExportDecoration; +SLANG_API const int __SlangIROpImport = Slang::kIROp_ImportDecoration; +SLANG_API const int __SlangIROpStringLit = Slang::kIROp_StringLit; +SLANG_API const int __SlangIROpIntLit = Slang::kIROp_IntLit; +#endif +#endif + diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp index 2568547a4..02b5b5bdc 100644 --- a/source/slang/slang-type-layout.cpp +++ b/source/slang/slang-type-layout.cpp @@ -465,6 +465,18 @@ struct CUDALayoutRulesImpl : DefaultLayoutRulesImpl return arrayInfo; } + // Given `size` between [0, 16] return the smallest power-of-2 that is greater than or equal to `size`. + uint32_t getVectorAlignment(uint32_t size) + { + SLANG_ASSERT(size <= 16); + --size; + // Set every bit after the highest bit. + size |= (size >> 1); + size |= (size >> 2); + ++size; + return size; + } + SimpleLayoutInfo GetVectorLayout(BaseType elementType, SimpleLayoutInfo elementInfo, size_t elementCount) override { // Special case bool @@ -479,8 +491,8 @@ struct CUDALayoutRulesImpl : DefaultLayoutRulesImpl SimpleLayoutInfo vectorInfo; vectorInfo.kind = elementInfo.kind; vectorInfo.size = elementInfo.size * elementCount; - vectorInfo.alignment = elementInfo.alignment; - + vectorInfo.alignment = getVectorAlignment( + (uint32_t)(elementInfo.size.getFiniteValue() * elementCount)); return vectorInfo; } diff --git a/source/slang/slang.natvis b/source/slang/slang.natvis index ea010c187..5af533715 100644 --- a/source/slang/slang.natvis +++ b/source/slang/slang.natvis @@ -83,20 +83,20 @@ <If Condition="child == 0"> <Break/> </If> - <If Condition="child->m_op == Slang::kIROp_NameHintDecoration"> + <If Condition="child->m_op == __SlangIROpNameHint"> <Item Name="[name]">((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.chars,[((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.numChars]s8</Item> </If> - <If Condition="child->m_op == Slang::kIROp_ExportDecoration"> + <If Condition="child->m_op == __SlangIROpExport"> <Item Name="[exportName]">((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.chars,[((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.numChars]s8</Item> </If> - <If Condition="child->m_op == Slang::kIROp_ImportDecoration"> + <If Condition="child->m_op == __SlangIROpImport"> <Item Name="[importName]">((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.chars,[((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.numChars]s8</Item> </If> <Exec>child = child->next</Exec> </Loop> </CustomListItems> - <Item Name="[value]" Condition="m_op == Slang::kIROp_StringLit">((IRStringLit*)this)->value.stringVal.chars,[((IRStringLit*)this)->value.stringVal.numChars]s8</Item> - <Item Name="[value]" Condition="m_op == Slang::kIROp_IntLit">((IRIntLit*)this)->value.intVal</Item> + <Item Name="[value]" Condition="m_op == __SlangIROpStringLit">((IRStringLit*)this)->value.stringVal.chars,[((IRStringLit*)this)->value.stringVal.numChars]s8</Item> + <Item Name="[value]" Condition="m_op == __SlangIROpIntLit">((IRIntLit*)this)->value.intVal</Item> <!-- <Synthetic Name="[operands]"> <DisplayString>{{count = {operandCount}}}</DisplayString> @@ -121,14 +121,14 @@ <Exec>child = pOperandInst->m_decorationsAndChildren.first</Exec> <Exec>nameDecoration = 0</Exec> <Loop Condition="child != 0"> - <If Condition="child->m_op == Slang::kIROp_NameHintDecoration"> + <If Condition="child->m_op == __SlangIROpNameHint"> <Exec>nameDecoration = child</Exec> <Break/> </If> - <If Condition="child->m_op == Slang::kIROp_ExportDecoration && (nameDecoration == 0 || nameDecoration->m_op != Slang::kIROp_NameHintDecoration)"> + <If Condition="child->m_op == __SlangIROpExport && (nameDecoration == 0 || nameDecoration->m_op != __SlangIROpNameHint)"> <Exec>nameDecoration = child</Exec> </If> - <If Condition="child->m_op == Slang::kIROp_ImportDecoration && (nameDecoration == 0 || nameDecoration->m_op != Slang::kIROp_NameHintDecoration)"> + <If Condition="child->m_op == __SlangIROpImport && (nameDecoration == 0 || nameDecoration->m_op != __SlangIROpNameHint)"> <Exec>nameDecoration = child</Exec> </If> <Exec>child = child->next</Exec> @@ -150,14 +150,14 @@ <Exec>child = pItem->m_decorationsAndChildren.first </Exec> <Exec>nameDecoration = 0</Exec> <Loop Condition="child != 0"> - <If Condition="child->m_op == Slang::kIROp_NameHintDecoration"> + <If Condition="child->m_op == __SlangIROpNameHint"> <Exec>nameDecoration = child</Exec> <Break/> </If> - <If Condition="child->m_op == Slang::kIROp_ExportDecoration && (nameDecoration == 0 || nameDecoration->m_op != Slang::kIROp_NameHintDecoration)"> + <If Condition="child->m_op == __SlangIROpExport && (nameDecoration == 0 || nameDecoration->m_op != __SlangIROpNameHint)"> <Exec>nameDecoration = child</Exec> </If> - <If Condition="child->m_op == Slang::kIROp_ImportDecoration && (nameDecoration == 0 || nameDecoration->m_op != Slang::kIROp_NameHintDecoration)"> + <If Condition="child->m_op == __SlangIROpImport && (nameDecoration == 0 || nameDecoration->m_op != __SlangIROpNameHint)"> <Exec>nameDecoration = child</Exec> </If> <Exec>child = child->next</Exec> |