diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/slang-diagnostic-defs.h | 5 | ||||
| -rw-r--r-- | source/slang/slang-ir-glsl-legalize.cpp | 73 |
2 files changed, 78 insertions, 0 deletions
diff --git a/source/slang/slang-diagnostic-defs.h b/source/slang/slang-diagnostic-defs.h index 03f52a701..789eac88f 100644 --- a/source/slang/slang-diagnostic-defs.h +++ b/source/slang/slang-diagnostic-defs.h @@ -606,6 +606,11 @@ DIAGNOSTIC(30019, Error, typeMismatch, "expected an expression of type '$0', got DIAGNOSTIC(30021, Error, noApplicationFunction, "$0: no overload takes arguments ($1)") DIAGNOSTIC(30022, Error, invalidTypeCast, "invalid type cast between \"$0\" and \"$1\".") DIAGNOSTIC(30023, Error, typeHasNoPublicMemberOfName, "\"$0\" does not have public member \"$1\".") +DIAGNOSTIC( + 30024, + Error, + cannotConvertArrayOfSmallerToLargerSize, + "Cannot convert array of size $0 to array of size $1 as this would truncate data") DIAGNOSTIC(30025, Error, invalidArraySize, "array size must be larger than zero.") DIAGNOSTIC( 30026, diff --git a/source/slang/slang-ir-glsl-legalize.cpp b/source/slang/slang-ir-glsl-legalize.cpp index c11ccc66d..11d5399cf 100644 --- a/source/slang/slang-ir-glsl-legalize.cpp +++ b/source/slang/slang-ir-glsl-legalize.cpp @@ -1528,6 +1528,43 @@ ScalarizedVal createSimpleGLSLGlobalVarying( val = ScalarizedVal::typeAdapter(typeAdapter); } + + if (auto requiredArrayType = as<IRArrayTypeBase>(systemValueInfo->requiredType)) + { + // Find first array declarator and handle size mismatch + for (auto dd = declarator; dd; dd = dd->next) + { + if (dd->flavor != GlobalVaryingDeclarator::Flavor::array) + continue; + + // Compare the array size + auto declaredArraySize = dd->elementCount; + auto requiredArraySize = requiredArrayType->getElementCount(); + if (declaredArraySize == requiredArraySize) + break; + + auto toSize = getIntVal(requiredArraySize); + auto fromSize = getIntVal(declaredArraySize); + if (toSize < fromSize) + { + context->getSink()->diagnose( + inVarLayout, + Diagnostics::cannotConvertArrayOfSmallerToLargerSize, + fromSize, + toSize); + } + + // Array sizes differ, need type adapter + RefPtr<ScalarizedTypeAdapterValImpl> typeAdapter = + new ScalarizedTypeAdapterValImpl; + typeAdapter->actualType = systemValueInfo->requiredType; + typeAdapter->pretendType = builder->getArrayType(inType, declaredArraySize); + typeAdapter->val = val; + + val = ScalarizedVal::typeAdapter(typeAdapter); + break; + } + } } } else @@ -1971,6 +2008,42 @@ ScalarizedVal adaptType(IRBuilder* builder, IRInst* val, IRType* toType, IRType* val, builder->getIntValue(builder->getIntType(), 0)); } + else if (auto toArray = as<IRArrayTypeBase>(toType)) + { + // If array sizes differ, we need to reshape the array + if (fromArray->getElementCount() != toArray->getElementCount()) + { + List<IRInst*> elements; + + // Get array sizes once + auto fromSize = getIntVal(fromArray->getElementCount()); + auto toSize = getIntVal(toArray->getElementCount()); + SLANG_ASSERT(fromSize <= toSize); + + // Extract elements one at a time up to the source array size + for (Index i = 0; i < fromSize; i++) + { + auto element = builder->emitElementExtract( + fromArray->getElementType(), + val, + builder->getIntValue(builder->getIntType(), i)); + elements.add(element); + } + + if (fromSize < toSize) + { + // Fill remaining elements with default value up to target size + auto elementType = toArray->getElementType(); + auto defaultValue = builder->emitDefaultConstruct(elementType); + for (Index i = fromSize; i < toSize; i++) + { + elements.add(defaultValue); + } + } + + val = builder->emitMakeArray(toType, elements.getCount(), elements.getBuffer()); + } + } } // TODO: actually consider what needs to go on here... return ScalarizedVal::value(builder->emitCast(toType, val)); |