Add shader object parameter binding to renderer_test. (#1622)

* Add shader object parameter binding to renderer_test.

* remove multiple-definitions.hlsl

* Fix cuda implementation.

Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>

20 files changed, 26 insertions, 25 deletions

diff --git a/tests/bugs/bool-init.slang b/tests/bugs/bool-init.slang
index 7484d450e..1e9627024 100644
--- a/tests/bugs/bool-init.slang
+++ b/tests/bugs/bool-init.slang
@@ -7,7 +7,7 @@ struct Thing
     bool b;
 };
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
 
 [numthreads(4, 1, 1)]
diff --git a/tests/bugs/bool-op.slang b/tests/bugs/bool-op.slang
index 1ce5d7c4f..c10c7e0dd 100644
--- a/tests/bugs/bool-op.slang
+++ b/tests/bugs/bool-op.slang
@@ -4,7 +4,7 @@
 
 // Confirm operations that produce bools - such as comparisons, or && ||, ! work correctly
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
 
 [numthreads(16, 1, 1)]
diff --git a/tests/bugs/gh-357.slang b/tests/bugs/gh-357.slang
index 7c2a87a41..90eba799b 100644
--- a/tests/bugs/gh-357.slang
+++ b/tests/bugs/gh-357.slang
@@ -1,5 +1,7 @@
 //TEST(compute):COMPARE_COMPUTE:
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+
 //TEST_INPUT:type AssocImpl
 
 
diff --git a/tests/bugs/gh-471.slang b/tests/bugs/gh-471.slang
index a68ade010..adc50e799 100644
--- a/tests/bugs/gh-471.slang
+++ b/tests/bugs/gh-471.slang
@@ -1,5 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:
-//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out,name outputBuffer
 
 // Test that "operator comma" works as expected
 
diff --git a/tests/bugs/gh-487.slang b/tests/bugs/gh-487.slang
index a86c4061f..08ae8aa06 100644
--- a/tests/bugs/gh-487.slang
+++ b/tests/bugs/gh-487.slang
@@ -15,7 +15,7 @@ int test(int val)
 	return int(result);
 }
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name gBuffer
 RWStructuredBuffer<int> gBuffer;
 
 [numthreads(4, 1, 1)]
diff --git a/tests/bugs/gh-518.slang b/tests/bugs/gh-518.slang
index 3f316c19e..8de61a94e 100644
--- a/tests/bugs/gh-518.slang
+++ b/tests/bugs/gh-518.slang
@@ -8,11 +8,11 @@
 // Confirm that we can handle arrays of resources
 // being passed to a function.
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name gBuffer
 RWStructuredBuffer<int> gBuffer;
 
-//TEST_INPUT: Texture2D(size=4, content=one):
-//TEST_INPUT: Texture2D(size=4, content=one):
+//TEST_INPUT: Texture2D(size=4, content=one):name gTextures[0]
+//TEST_INPUT: Texture2D(size=4, content=one):name gTextures[1]
 Texture2D gTextures[2];
 
 float broken(Texture2D t[2])
diff --git a/tests/bugs/gh-519.slang b/tests/bugs/gh-519.slang
index 733864c85..207fa6d0a 100644
--- a/tests/bugs/gh-519.slang
+++ b/tests/bugs/gh-519.slang
@@ -29,7 +29,7 @@ int test(int val)
     return tmp;
 }
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name gBuffer
 RWStructuredBuffer<int> gBuffer;
 
 [numthreads(4, 1, 1)]
diff --git a/tests/bugs/gh-566.slang b/tests/bugs/gh-566.slang
index 5e5803aea..4c5fa1772 100644
--- a/tests/bugs/gh-566.slang
+++ b/tests/bugs/gh-566.slang
@@ -1,8 +1,8 @@
 // legalize-struct-init.slang
 
 //TEST(compute):COMPARE_COMPUTE:
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
-//TEST_INPUT:ubuffer(data=[4 3 2 1], stride=4):
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+//TEST_INPUT:ubuffer(data=[4 3 2 1], stride=4):name inputBuffer
 
 
 RWStructuredBuffer<uint> outputBuffer;
diff --git a/tests/bugs/gh-569.slang b/tests/bugs/gh-569.slang
index c0a65aaa8..21fbfa514 100644
--- a/tests/bugs/gh-569.slang
+++ b/tests/bugs/gh-569.slang
@@ -21,7 +21,7 @@ uint test(uint inVal)
     return tmp + inVal;
 }
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name gBuffer
 RWStructuredBuffer<uint> gBuffer;
 
 [numthreads(4, 1, 1)]
diff --git a/tests/bugs/gh-775.slang b/tests/bugs/gh-775.slang
index f98765bdb..867233919 100644
--- a/tests/bugs/gh-775.slang
+++ b/tests/bugs/gh-775.slang
@@ -17,7 +17,7 @@ int test(int inVal)
     return int(dot(v, float4(1, 16, 256, 4096)));
 }
 
-//TEST_INPUT:ubuffer(data=[9 9 9 9], stride=4):out
+//TEST_INPUT:ubuffer(data=[9 9 9 9], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer : register(u0);
 
 [numthreads(4, 1, 1)]
diff --git a/tests/bugs/gl-33.slang b/tests/bugs/gl-33.slang
index b459bf409..10c9ea208 100644
--- a/tests/bugs/gl-33.slang
+++ b/tests/bugs/gl-33.slang
@@ -13,7 +13,7 @@ int test(int val)
     return b.next();
 }
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name gBuffer
 RWStructuredBuffer<int> gBuffer;
 
 [numthreads(4, 1, 1)]
diff --git a/tests/bugs/glsl-static-const-array.slang b/tests/bugs/glsl-static-const-array.slang
index f4e953259..4d03d5ef8 100644
--- a/tests/bugs/glsl-static-const-array.slang
+++ b/tests/bugs/glsl-static-const-array.slang
@@ -7,7 +7,7 @@ static const int gData[4] =
     0xA, 0xB, 0xC, 0xD,
 };
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name gBuffer
 RWStructuredBuffer<int> gBuffer;
 
 [numthreads(4,1,1)]
diff --git a/tests/bugs/nested-generics-call.slang b/tests/bugs/nested-generics-call.slang
index 9a540a261..ba1566ec2 100644
--- a/tests/bugs/nested-generics-call.slang
+++ b/tests/bugs/nested-generics-call.slang
@@ -1,6 +1,6 @@
 //TEST(compute):COMPARE_COMPUTE:
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
 
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<float> outputBuffer;
 
 interface IBase
diff --git a/tests/bugs/nested-generics-method-call.slang b/tests/bugs/nested-generics-method-call.slang
index a127ed0da..fa0a983b9 100644
--- a/tests/bugs/nested-generics-method-call.slang
+++ b/tests/bugs/nested-generics-method-call.slang
@@ -1,6 +1,6 @@
 //TEST(compute):COMPARE_COMPUTE:
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
 
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<float> outputBuffer;
 
 interface IBase
diff --git a/tests/bugs/paren-insertion-bug.slang b/tests/bugs/paren-insertion-bug.slang
index 6c989d793..790934372 100644
--- a/tests/bugs/paren-insertion-bug.slang
+++ b/tests/bugs/paren-insertion-bug.slang
@@ -19,7 +19,7 @@ int test(float a)
 }
 
 
-//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<uint> outputBuffer;
 
 [numthreads(4, 1, 1)]
diff --git a/tests/bugs/static-method.slang b/tests/bugs/static-method.slang
index c728e9053..f95d40def 100644
--- a/tests/bugs/static-method.slang
+++ b/tests/bugs/static-method.slang
@@ -10,7 +10,7 @@ struct S
     }
 }
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer : register(u0);
 
 int test(int t)
diff --git a/tests/bugs/static-var.slang b/tests/bugs/static-var.slang
index d130b6a7d..75662c7b5 100644
--- a/tests/bugs/static-var.slang
+++ b/tests/bugs/static-var.slang
@@ -7,7 +7,7 @@ int test(int inVal)
     return inVal + kVal;
 }
 
-//TEST_INPUT:ubuffer(data=[9 9 9 9], stride=4):out
+//TEST_INPUT:ubuffer(data=[9 9 9 9], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer : register(u0);
 
 [numthreads(4, 1, 1)]
diff --git a/tests/bugs/texture2d-gather.hlsl b/tests/bugs/texture2d-gather.hlsl
index 2fc9424c5..6eb8b1af7 100644
--- a/tests/bugs/texture2d-gather.hlsl
+++ b/tests/bugs/texture2d-gather.hlsl
@@ -1,6 +1,6 @@
 //TEST(smoke):COMPARE_HLSL_RENDER:
-//TEST_INPUT: Texture2D(size=16, content=chessboard, format=R_Float32):
-//TEST_INPUT: Sampler :
+//TEST_INPUT: Texture2D(size=16, content=chessboard, format=R_Float32):name g_texture
+//TEST_INPUT: Sampler :name g_sampler
 
 Texture2D<float> g_texture : register(t0);
 SamplerState g_sampler : register(s0);
diff --git a/tests/bugs/vec-compare.slang b/tests/bugs/vec-compare.slang
index 2b233f80f..7a6d8388d 100644
--- a/tests/bugs/vec-compare.slang
+++ b/tests/bugs/vec-compare.slang
@@ -2,8 +2,7 @@
 //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
 
-//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out
-
+//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
 
 [numthreads(4,4,1)]
diff --git a/tests/bugs/while-in-generic.slang b/tests/bugs/while-in-generic.slang
index 7d2b8b255..4efa9a5d2 100644
--- a/tests/bugs/while-in-generic.slang
+++ b/tests/bugs/while-in-generic.slang
@@ -12,7 +12,7 @@ struct Context
         return i;
     }
 };
-//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
 
 [numthreads(4, 1, 1)]