Capability type checking. (#3530)

* Capability type checking.

* Fix.

---------

Co-authored-by: Yong He <yhe@nvidia.com>

3 files changed, 4 insertions, 61 deletions

diff --git a/tests/vkray/callable-caller.slang b/tests/vkray/callable-caller.slang
index 64311988a..6a0c85c38 100644
--- a/tests/vkray/callable-caller.slang
+++ b/tests/vkray/callable-caller.slang
@@ -1,6 +1,8 @@
 // callable-caller.slang
 
-//TEST:CROSS_COMPILE: -profile glsl_460 -capability GL_NV_ray_tracing -stage raygeneration -entry main -target spirv-assembly
+//TEST:SIMPLE(filecheck=CHECK): -profile glsl_460 -capability GL_NV_ray_tracing -stage raygeneration -entry main -target spirv-assembly
+//TEST:SIMPLE(filecheck=CHECK): -profile glsl_460 -capability GL_NV_ray_tracing -stage raygeneration -entry main -target spirv-assembly -emit-spirv-directly
+
 
 import callable_shared;
 
@@ -16,7 +18,7 @@ void main()
 	MaterialPayload payload;
 	payload.albedo = 0;
 	payload.uv = float2(DispatchRaysIndex().xy) / float2(DispatchRaysDimensions().xy);
-
+	// CHECK: OpExecuteCallable
 	CallShader(shaderIndex, payload);
 
 	gImage[DispatchRaysIndex().xy] = payload.albedo;
diff --git a/tests/vkray/callable-caller.slang.glsl b/tests/vkray/callable-caller.slang.glsl
deleted file mode 100644
index a42e6eaf3..000000000
--- a/tests/vkray/callable-caller.slang.glsl
+++ /dev/null
@@ -1,49 +0,0 @@
-#version 460
-#extension GL_NV_ray_tracing : require
-layout(row_major) uniform;
-layout(row_major) buffer;
-struct MaterialPayload_0
-{
-    vec4 albedo_0;
-    vec2 uv_0;
-};
-
-layout(location = 0)
-callableDataNV
-MaterialPayload_0 p_0;
-
-struct SLANG_ParameterGroup_C_0
-{
-    uint shaderIndex_0;
-};
-
-layout(binding = 0)
-layout(std140) uniform _S1
-{
-    uint shaderIndex_0;
-} C_0;
-void CallShader_0(uint shaderIndex_1, inout MaterialPayload_0 payload_0)
-{
-    p_0 = payload_0;
-    executeCallableNV(shaderIndex_1, (0));
-    payload_0 = p_0;
-    return;
-}
-
-layout(rgba32f)
-layout(binding = 1)
-uniform image2D gImage_0;
-
-void main()
-{
-    MaterialPayload_0 payload_1;
-    payload_1.albedo_0 = vec4(0.0);
-    uvec3 _S2 = ((gl_LaunchIDNV));
-    vec2 _S3 = vec2(_S2.xy);
-    uvec3 _S4 = ((gl_LaunchSizeNV));
-    payload_1.uv_0 = _S3 / vec2(_S4.xy);
-    CallShader_0(C_0.shaderIndex_0, payload_1);
-    uvec3 _S5 = ((gl_LaunchIDNV));
-    imageStore((gImage_0), ivec2((_S5.xy)), payload_1.albedo_0);
-    return;
-}
diff --git a/tests/vkray/miss.slang.glsl b/tests/vkray/miss.slang.glsl
index df7647411..1bc6af5b3 100644
--- a/tests/vkray/miss.slang.glsl
+++ b/tests/vkray/miss.slang.glsl
@@ -1,17 +1,7 @@
 //TEST_IGNORE_FILE:
 #version 460                  
 
-#if USE_NV_RT
-#extension GL_NV_ray_tracing : require
-#define callableDataInEXT callableDataInNV
-#define gl_LaunchIDEXT gl_LaunchIDNV
-#define hitAttributeEXT hitAttributeNV
-#define ignoreIntersectionEXT ignoreIntersectionNV
-#define rayPayloadInEXT rayPayloadInNV
-#define terminateRayEXT terminateRayNV
-#else
 #extension GL_EXT_ray_tracing : require
-#endif
 
 struct ShadowRay_0
 {