Merge pull request #364 from csyonghe/assoctype

Support nested generics

6 files changed, 131 insertions, 0 deletions

diff --git a/tests/compute/nested-generics.slang b/tests/compute/nested-generics.slang
new file mode 100644
index 000000000..63b6db4fe
--- /dev/null
+++ b/tests/compute/nested-generics.slang
@@ -0,0 +1,40 @@
+//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
+
+// test specialization of nested generic functions
+
+RWStructuredBuffer<int> outputBuffer;
+
+interface IGetF
+{
+    float getF();
+}
+
+struct GetFImpl : IGetF
+{
+    float getF() { return 1.0; }
+};
+
+struct GetFImpl2 : IGetF
+{
+    float getF() { return -1.0; }
+};
+
+struct GenStruct<T : IGetF>
+{
+	T x;
+	float genGet<U : IGetF>(U y)
+    {
+        return x.getF() + y.getF();
+    }
+};
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+	uint tid = dispatchThreadID.x;
+    GenStruct<GetFImpl> obj1;
+    GetFImpl2 obj2;
+	float outVal = obj1.genGet(obj2);
+	outputBuffer[tid] = int(outVal);
+}
\ No newline at end of file
diff --git a/tests/compute/nested-generics.slang.expected.txt b/tests/compute/nested-generics.slang.expected.txt
new file mode 100644
index 000000000..ae25f7400
--- /dev/null
+++ b/tests/compute/nested-generics.slang.expected.txt
@@ -0,0 +1,4 @@
+0
+0
+0
+0
\ No newline at end of file
diff --git a/tests/compute/nested-generics2.slang b/tests/compute/nested-generics2.slang
new file mode 100644
index 000000000..6a14c7678
--- /dev/null
+++ b/tests/compute/nested-generics2.slang
@@ -0,0 +1,43 @@
+//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
+
+// test specialization of nested generic functions
+
+RWStructuredBuffer<int> outputBuffer;
+
+interface IBRDF
+{
+    float getF();
+}
+
+interface ILight
+{
+    float illum<B:IBRDF>(B b);
+};
+
+struct B0 : IBRDF
+{
+    float getF() { return 1.0; }
+};
+
+struct L0 : ILight
+{
+    float illum<B:IBRDF>(B b) { return b.getF(); }
+};
+
+struct L1<L:ILight> : ILight
+{
+    L l;
+    float illum<BXX:IBRDF>(BXX bxx) { return l.illum<BXX>(bxx); }
+};
+
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+	uint tid = dispatchThreadID.x;
+    L1<L0> light;
+    B0 b0;
+	float outVal = light.illum<B0>(b0);
+	outputBuffer[tid] = int(outVal);
+}
\ No newline at end of file
diff --git a/tests/compute/nested-generics2.slang.expected.txt b/tests/compute/nested-generics2.slang.expected.txt
new file mode 100644
index 000000000..ef529012e
--- /dev/null
+++ b/tests/compute/nested-generics2.slang.expected.txt
@@ -0,0 +1,4 @@
+1
+1
+1
+1
\ No newline at end of file
diff --git a/tests/compute/struct-in-generic.slang b/tests/compute/struct-in-generic.slang
new file mode 100644
index 000000000..6f65f2ee3
--- /dev/null
+++ b/tests/compute/struct-in-generic.slang
@@ -0,0 +1,36 @@
+//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
+
+// Confirm that a struct type defined in a generic parent works
+
+RWStructuredBuffer<float> outputBuffer;
+
+struct GenStruct<T>
+{
+    struct SubType
+    {
+        T x;
+    };
+    T getVal(SubType v)
+    {
+        return v.x;
+    }
+};
+
+T test<T>(T val)
+{
+    GenStruct<T>.SubType sb;
+    sb.x = val;
+    GenStruct<T> obj;
+    return obj.getVal(sb);
+}
+
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    uint tid = dispatchThreadID.x;
+    float inVal = float(tid);
+    float outVal = test(inVal);
+    outputBuffer[tid] = outVal.x;
+}
\ No newline at end of file
diff --git a/tests/compute/struct-in-generic.slang.expected.txt b/tests/compute/struct-in-generic.slang.expected.txt
new file mode 100644
index 000000000..ae6b9920b
--- /dev/null
+++ b/tests/compute/struct-in-generic.slang.expected.txt
@@ -0,0 +1,4 @@
+0
+3F800000
+40000000
+40400000