From a598263800ffee49d7950a7df4f70e9b893e42fe Mon Sep 17 00:00:00 2001
From: Konstantin Seurer <konstantin.seurer@gmail.com>
Date: Wed, 7 Dec 2022 16:20:22 +0100
Subject: [PATCH] radv/rt: Move load_hit_attrib_amd to the top

Make sure to load hit attributes before a trace_ray call can overwrite them.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19866>
---
 src/amd/vulkan/radv_rt_shader.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/amd/vulkan/radv_rt_shader.c b/src/amd/vulkan/radv_rt_shader.c
index 36834fd..7e00ced 100644
--- a/src/amd/vulkan/radv_rt_shader.c
+++ b/src/amd/vulkan/radv_rt_shader.c
@@ -1372,6 +1372,7 @@ static bool
 should_move_rt_instruction(nir_intrinsic_op intrinsic)
 {
    switch (intrinsic) {
+   case nir_intrinsic_load_hit_attrib_amd:
    case nir_intrinsic_load_rt_arg_scratch_offset_amd:
    case nir_intrinsic_load_ray_flags:
    case nir_intrinsic_load_ray_object_origin:
-- 
2.7.4