Merge pull request #371 from csyonghe/master

All compiler fixes to get ir branch work with falcor feature demo.

2 files changed, 36 insertions, 0 deletions

diff --git a/tests/compute/generics-overload.slang b/tests/compute/generics-overload.slang
new file mode 100644
index 000000000..e530acb59
--- /dev/null
+++ b/tests/compute/generics-overload.slang
@@ -0,0 +1,32 @@
+//TEST(smoke,compute):COMPARE_COMPUTE:-xslang -use-ir
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
+// Confirm that generics syntax can be used in user
+// code and generates valid output.
+
+RWStructuredBuffer<float> outputBuffer;
+
+
+__generic<T>
+T test(T val)
+{
+	return val;
+}
+
+__generic<T>
+T test(T val, int a)
+{
+	return val;
+}
+
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+	uint tid = dispatchThreadID.x;
+
+	float inVal = float(tid);
+
+	float outVal = test<float>(inVal, 0);
+
+	outputBuffer[tid] = outVal;
+}
\ No newline at end of file
diff --git a/tests/compute/generics-overload.slang.expected.txt b/tests/compute/generics-overload.slang.expected.txt
new file mode 100644
index 000000000..98798bd61
--- /dev/null
+++ b/tests/compute/generics-overload.slang.expected.txt
@@ -0,0 +1,4 @@
+0
+3F800000
+40000000
+40400000
\ No newline at end of file