From b8617af2888db01f80efba9e0a103e6a61989c9c Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 24 Mar 2022 11:42:56 -0400 Subject: Fix for default initialization with generic field (#2168) * #include an absolute path didn't work - because paths were taken to always be relative. * Fix for = {} initialization with a field that is generic type parameter. * Handling for if a non type is passed to a generic parameter which requires a type. * Small comment improvements. Fix some tab issues. * This fixes the matrix.slang issue. Move the matrix.slang test into bugs as generic-default-matrix.slang --- .../generic-invalid-type-specialization.slang | 20 ++++++++++++++++++++ ...eneric-invalid-type-specialization.slang.expected | 8 ++++++++ 2 files changed, 28 insertions(+) create mode 100644 tests/diagnostics/generic-invalid-type-specialization.slang create mode 100644 tests/diagnostics/generic-invalid-type-specialization.slang.expected (limited to 'tests/diagnostics') diff --git a/tests/diagnostics/generic-invalid-type-specialization.slang b/tests/diagnostics/generic-invalid-type-specialization.slang new file mode 100644 index 000000000..28d155643 --- /dev/null +++ b/tests/diagnostics/generic-invalid-type-specialization.slang @@ -0,0 +1,20 @@ +//DIAGNOSTIC_TEST:SIMPLE: + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer +RWStructuredBuffer outputBuffer; + +struct Check +{ + T v; +}; + +[numthreads(4, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + int index = dispatchThreadID.x; + + // Invalid as should only accept a type + Check<2 + 2> v; + + outputBuffer[index] = index; +} diff --git a/tests/diagnostics/generic-invalid-type-specialization.slang.expected b/tests/diagnostics/generic-invalid-type-specialization.slang.expected new file mode 100644 index 000000000..b3c75c760 --- /dev/null +++ b/tests/diagnostics/generic-invalid-type-specialization.slang.expected @@ -0,0 +1,8 @@ +result code = -1 +standard error = { +tests/diagnostics/generic-invalid-type-specialization.slang(17): error 30060: expected a type, got a 'InfixExpr' + Check<2 + 2> v; + ^ +} +standard output = { +} -- cgit v1.2.3