Merge branch 'master' into fix-nested-type-conformances

2 files changed, 45 insertions, 0 deletions

diff --git a/tests/compute/generic-closer.slang b/tests/compute/generic-closer.slang
new file mode 100644
index 000000000..f3bb643de
--- /dev/null
+++ b/tests/compute/generic-closer.slang
@@ -0,0 +1,41 @@
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
+//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
+
+interface IGetter
+{
+    int get();
+}
+struct Gen0 : IGetter
+{
+    int get() { return 1; }
+};
+struct Gen1<TGetter : IGetter> : IGetter
+{
+    TGetter g;
+    int get() { return g.get(); }
+};
+
+RWStructuredBuffer<int> outputBuffer;
+void writeArray(inout float3 a[4])
+{
+    a[0] = float3(1, 1, 1);
+    a[1] = float3(1, 1, 1);
+    a[2] = float3(1, 1, 1);
+    a[3] = float3(1, 1, 1);    
+}
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    Gen1<Gen1<Gen1<Gen0>>> g;
+    Gen1<Gen1<Gen1<Gen1<Gen0>>>> g2;
+    Gen1<Gen1<Gen0>> g3;
+
+    int a = 0; 
+    int b = 5;
+    if (a< b && b > a)
+	    outputBuffer[dispatchThreadID.x] = (g.get() >> 1) + g2.get() + g3.get();
+}
\ No newline at end of file
diff --git a/tests/compute/generic-closer.slang.expected.txt b/tests/compute/generic-closer.slang.expected.txt
new file mode 100644
index 000000000..01dd2b944
--- /dev/null
+++ b/tests/compute/generic-closer.slang.expected.txt
@@ -0,0 +1,4 @@
+2
+2
+2
+2
\ No newline at end of file