summaryrefslogtreecommitdiff
path: root/tests/hlsl-intrinsic/shader-execution-reordering
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2023-02-16 13:55:32 -0800
committerGitHub <noreply@github.com>2023-02-16 13:55:32 -0800
commit4c4826d47eeef4675daae4ae53ff76f4d5ebd84a (patch)
treeed4af0ded878e4f06e9641ce61d26ffd7c89ccbc /tests/hlsl-intrinsic/shader-execution-reordering
parenteda88e513e8b1e2abc05e9dc8555f237d96472df (diff)
Overhaul global inst deduplication and cpp/cuda backend. (#2654)
* Overhaul global inst deduplication and cpp/cuda backend. * Update IR documentation. --------- Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'tests/hlsl-intrinsic/shader-execution-reordering')
-rw-r--r--tests/hlsl-intrinsic/shader-execution-reordering/hit-object-reorder-thread.slang.1.expected26
-rw-r--r--tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-motion-ray.slang.1.expected8
-rw-r--r--tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-ray.slang.1.expected8
3 files changed, 21 insertions, 21 deletions
diff --git a/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-reorder-thread.slang.1.expected b/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-reorder-thread.slang.1.expected
index 58f06cfec..6e3e5d5d8 100644
--- a/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-reorder-thread.slang.1.expected
+++ b/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-reorder-thread.slang.1.expected
@@ -17,13 +17,17 @@ layout(location = 0)
rayPayloadEXT
SomeValues_0 p_0;
-layout(binding = 0)
-uniform accelerationStructureEXT scene_0;
-
layout(location = 0)
hitObjectAttributeNV
SomeValues_0 t_0;
+layout(location = 1)
+rayPayloadEXT
+SomeValues_0 p_1;
+
+layout(binding = 0)
+uniform accelerationStructureEXT scene_0;
+
SomeValues_0 HitObject_GetAttributes_0(hitObjectNV this_0)
{
hitObjectGetAttributesNV((this_0), ((0)));
@@ -50,15 +54,11 @@ uint calcValue_0(hitObjectNV hit_0)
return r_0;
}
-layout(location = 1)
-rayPayloadEXT
-SomeValues_0 p_1;
-
void HitObject_Invoke_0(accelerationStructureEXT AccelerationStructure_0, hitObjectNV HitOrMiss_0, inout SomeValues_0 Payload_0)
{
- p_1 = Payload_0;
- hitObjectExecuteShaderNV(HitOrMiss_0, (1));
- Payload_0 = p_1;
+ p_0 = Payload_0;
+ hitObjectExecuteShaderNV(HitOrMiss_0, (0));
+ Payload_0 = p_0;
return;
}
@@ -87,10 +87,10 @@ void main()
ray_0.Direction_0 = vec3(0.0, 1.0, 0.0);
ray_0.TMax_0 = 10000.0;
RayDesc_0 _S7 = ray_0;
- p_0.a_0 = idx_0;
- p_0.b_0 = _S6;
+ p_1.a_0 = idx_0;
+ p_1.b_0 = _S6;
hitObjectNV hitObj_0;
- hitObjectTraceRayNV(hitObj_0, scene_0, 20U, 255U, 0U, 4U, 0U, _S7.Origin_0, _S7.TMin_0, _S7.Direction_0, _S7.TMax_0, (0));
+ hitObjectTraceRayNV(hitObj_0, scene_0, 20U, 255U, 0U, 4U, 0U, _S7.Origin_0, _S7.TMin_0, _S7.Direction_0, _S7.TMax_0, (1));
uint r_1 = calcValue_0(hitObj_0);
reorderThreadNV(hitObj_0);
float _S8 = _S5 * 4.0;
diff --git a/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-motion-ray.slang.1.expected b/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-motion-ray.slang.1.expected
index e6d31a3c8..12025efe0 100644
--- a/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-motion-ray.slang.1.expected
+++ b/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-motion-ray.slang.1.expected
@@ -15,16 +15,16 @@ struct SomeValues_0
};
layout(location = 0)
+hitObjectAttributeNV
+SomeValues_0 t_0;
+
+layout(location = 0)
rayPayloadEXT
SomeValues_0 p_0;
layout(binding = 0)
uniform accelerationStructureEXT scene_0;
-layout(location = 0)
-hitObjectAttributeNV
-SomeValues_0 t_0;
-
SomeValues_0 HitObject_GetAttributes_0(hitObjectNV this_0)
{
hitObjectGetAttributesNV((this_0), ((0)));
diff --git a/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-ray.slang.1.expected b/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-ray.slang.1.expected
index 9b5a4d193..ac4d78234 100644
--- a/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-ray.slang.1.expected
+++ b/tests/hlsl-intrinsic/shader-execution-reordering/hit-object-trace-ray.slang.1.expected
@@ -14,16 +14,16 @@ struct SomeValues_0
};
layout(location = 0)
+hitObjectAttributeNV
+SomeValues_0 t_0;
+
+layout(location = 0)
rayPayloadEXT
SomeValues_0 p_0;
layout(binding = 0)
uniform accelerationStructureEXT scene_0;
-layout(location = 0)
-hitObjectAttributeNV
-SomeValues_0 t_0;
-
SomeValues_0 HitObject_GetAttributes_0(hitObjectNV this_0)
{
hitObjectGetAttributesNV((this_0), ((0)));