8 files changed, 47 insertions, 7 deletions
diff --git a/tests/compute/entry-point-uniform-params.slang b/tests/compute/entry-point-uniform-params.slang
index 4ca8d6786..736a4c05a 100644
--- a/tests/compute/entry-point-uniform-params.slang
+++ b/tests/compute/entry-point-uniform-params.slang
@@ -32,9 +32,9 @@ ConstantBuffer<Signs> signs;
 
 [numthreads(4, 1, 1)]
 void computeMain(
-//TEST_INPUT:cbuffer(data=[2 0 0 0 3 0 0 0]):name=stuff
+//TEST_INPUT:root_constants(data=[2 0 0 0 3 0 0 0]):name=stuff
 	uniform Stuff  stuff,
-//TEST_INPUT:cbuffer(data=[3]):onlyCPULikeBinding,name=things
+//TEST_INPUT:root_constants(data=[3]):onlyCPULikeBinding,name=things
 	uniform Things things,
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer
diff --git a/tests/compute/interface-shader-param-in-struct.slang b/tests/compute/interface-shader-param-in-struct.slang
index 04854906a..05db7fb39 100644
--- a/tests/compute/interface-shader-param-in-struct.slang
+++ b/tests/compute/interface-shader-param-in-struct.slang
@@ -79,7 +79,7 @@ struct Stuff
 
 [numthreads(4, 1, 1)]
 void computeMain(
-//TEST_INPUT:cbuffer(data=[256]):
+//TEST_INPUT:root_constants(data=[256]):
     uniform Stuff stuff,
 
     uint3       dispatchThreadID : SV_DispatchThreadID)
diff --git a/tests/compute/interface-shader-param2.slang b/tests/compute/interface-shader-param2.slang
index 0d15d9657..6127b3618 100644
--- a/tests/compute/interface-shader-param2.slang
+++ b/tests/compute/interface-shader-param2.slang
@@ -51,7 +51,7 @@ ConstantBuffer<IRandomNumberGenerationStrategy> gStrategy;
 [numthreads(4, 1, 1)]
 void computeMain(
 
-//TEST_INPUT:cbuffer(data=[8 0 0 0], stride=4):
+//TEST_INPUT:root_constants(data=[8 0 0 0], stride=4):
     uniform IModifier   modifier,
             uint3       dispatchThreadID : SV_DispatchThreadID)
 {
diff --git a/tests/compute/interface-shader-param3.slang b/tests/compute/interface-shader-param3.slang
index 7e42595a1..17236642c 100644
--- a/tests/compute/interface-shader-param3.slang
+++ b/tests/compute/interface-shader-param3.slang
@@ -83,7 +83,7 @@ void computeMain(
 //
 // Here's the incantation to make the test runner fill in the constant buffer:
 //
-//TEST_INPUT:cbuffer(data=[256 0 0 0 16 0 0 0], stride=4):
+//TEST_INPUT:root_constants(data=[256 0 0 0 16 0 0 0], stride=4):
 //
 // So, the value `256` will be used for `extra` and the value `16`
 // will be written to the first four bytes of the concrete value
diff --git a/tests/compute/interface-shader-param4.slang b/tests/compute/interface-shader-param4.slang
index 625fc751c..6226fd4c6 100644
--- a/tests/compute/interface-shader-param4.slang
+++ b/tests/compute/interface-shader-param4.slang
@@ -83,7 +83,7 @@ void computeMain(
 // the previous test, the concrete type plugged in for `modifier`
 // has no uniform/ordinary data, so we don't need to fill it in.
 //
-//TEST_INPUT:cbuffer(data=[256]):
+//TEST_INPUT:root_constants(data=[256]):
 
             uint3       dispatchThreadID : SV_DispatchThreadID)
 {
diff --git a/tests/language-feature/shader-params/entry-point-uniform-params.slang b/tests/language-feature/shader-params/entry-point-uniform-params.slang
index b94fc4556..b92af5818 100644
--- a/tests/language-feature/shader-params/entry-point-uniform-params.slang
+++ b/tests/language-feature/shader-params/entry-point-uniform-params.slang
@@ -23,7 +23,7 @@ int test(int val, int a, int b)
 [shader("compute")]
 void computeMain(
 
-//TEST_INPUT:cbuffer(data=[256 1]):name=d
+//TEST_INPUT:root_constants(data=[256 1]):name=d
 	uniform Data d,
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer
diff --git a/tests/vkray/entry-point-params.slang b/tests/vkray/entry-point-params.slang
new file mode 100644
index 000000000..84c8ecb50
--- /dev/null
+++ b/tests/vkray/entry-point-params.slang
@@ -0,0 +1,14 @@
+// entry-point-params.slang
+
+// Test that entry-point `uniform` parameters on ray-tracing
+// shaders properly map to the "shader record" in SPIR-V output.
+
+//TEST:CROSS_COMPILE: -profile glsl_460 -stage raygeneration -entry main -target spirv-assembly
+
+RWStructuredBuffer<float> buffer;
+
+void main(
+	uniform float value) 
+{
+	buffer[DispatchRaysIndex().x] = value;
+}
diff --git a/tests/vkray/entry-point-params.slang.glsl b/tests/vkray/entry-point-params.slang.glsl
new file mode 100644
index 000000000..8333f21c9
--- /dev/null
+++ b/tests/vkray/entry-point-params.slang.glsl
@@ -0,0 +1,26 @@
+//TEST_IGNORE_FILE:
+#version 460
+#extension GL_NV_ray_tracing : require
+
+layout(std430, binding = 0)
+buffer _S1 {
+    float _data[];
+} buffer_0;
+
+struct EntryPointParams_0
+{
+    float value_0;
+};
+
+layout(shaderRecordNV)
+buffer _S2
+{
+    EntryPointParams_0 _data;
+} _S3;
+
+void main()
+{
+    uvec3 _S4 = gl_LaunchIDNV;
+    buffer_0._data[_S4.x] = _S3._data.value_0;
+    return;
+}