Merge branch 'master' into generic-param-fix

2 files changed, 27 insertions, 0 deletions

diff --git a/tests/compute/global-init.slang b/tests/compute/global-init.slang
new file mode 100644
index 000000000..909cdf7e6
--- /dev/null
+++ b/tests/compute/global-init.slang
@@ -0,0 +1,23 @@
+//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir
+//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out
+
+// Test that a global variable (not a shader parameter)
+// with an initializer works.
+
+static int gVar = 16;
+
+int test(int inVal)
+{
+	return inVal + gVar;
+}
+
+RWStructuredBuffer<int> outputBuffer : register(u0);
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+	uint tid = dispatchThreadID.x;
+	int inVal = outputBuffer[tid];
+	int outVal = test(inVal);
+	outputBuffer[tid] = outVal;
+}
\ No newline at end of file
diff --git a/tests/compute/global-init.slang.expected.txt b/tests/compute/global-init.slang.expected.txt
new file mode 100644
index 000000000..a0d427709
--- /dev/null
+++ b/tests/compute/global-init.slang.expected.txt
@@ -0,0 +1,4 @@
+10
+11
+12
+13