Module: Mesa
Branch: main
Commit: f30fa9dec8612075977df0007eeb8a25af01cc2b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f30fa9dec8612075977df0007eeb8a25af01cc2b
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Date: Tue Jan 2 15:15:15 2024 +0100
radv: move radv_rt_{common,shader} files to nir/
These files contains NIR lowering code for RT.
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26851>
---
src/amd/vulkan/meson.build | 4 ++--
src/amd/vulkan/nir/radv_nir_lower_ray_queries.c | 2 +-
src/amd/vulkan/{radv_rt_common.c => nir/radv_nir_rt_common.c} | 2 +-
src/amd/vulkan/{radv_rt_common.h => nir/radv_nir_rt_common.h} | 0
src/amd/vulkan/{radv_rt_shader.c => nir/radv_nir_rt_shader.c} | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index f1f982e31e1..09f8b9de066 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -88,6 +88,8 @@ libradv_files = files(
'nir/radv_nir_lower_view_index.c',
'nir/radv_nir_lower_viewport_to_zero.c',
'nir/radv_nir_lower_vs_inputs.c',
+ 'nir/radv_nir_rt_common.c',
+ 'nir/radv_nir_rt_shader.c',
'winsys/null/radv_null_bo.c',
'winsys/null/radv_null_bo.h',
'winsys/null/radv_null_cs.c',
@@ -125,8 +127,6 @@ libradv_files = files(
'radv_radeon_winsys.h',
'radv_rmv.c',
'radv_rra.c',
- 'radv_rt_common.c',
- 'radv_rt_shader.c',
'radv_sampler.c',
'radv_sdma.c',
'radv_sdma.h',
diff --git a/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c
b/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c
index a66277db04e..f6c97fdce3d 100644
--- a/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c
+++ b/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c
@@ -27,10 +27,10 @@
#include "util/hash_table.h"
#include "bvh/bvh.h"
+#include "nir/radv_nir_rt_common.h"
#include "radv_debug.h"
#include "radv_nir.h"
#include "radv_private.h"
-#include "radv_rt_common.h"
#include "radv_shader.h"
/* Traversal stack size. Traversal supports backtracking so we can go deeper
than this size if
diff --git a/src/amd/vulkan/radv_rt_common.c
b/src/amd/vulkan/nir/radv_nir_rt_common.c
similarity index 99%
rename from src/amd/vulkan/radv_rt_common.c
rename to src/amd/vulkan/nir/radv_nir_rt_common.c
index 8fb70291875..51f4d209448 100644
--- a/src/amd/vulkan/radv_rt_common.c
+++ b/src/amd/vulkan/nir/radv_nir_rt_common.c
@@ -21,7 +21,7 @@
* IN THE SOFTWARE.
*/
-#include "radv_rt_common.h"
+#include "nir/radv_nir_rt_common.h"
#include "bvh/bvh.h"
#include "radv_debug.h"
diff --git a/src/amd/vulkan/radv_rt_common.h
b/src/amd/vulkan/nir/radv_nir_rt_common.h
similarity index 100%
rename from src/amd/vulkan/radv_rt_common.h
rename to src/amd/vulkan/nir/radv_nir_rt_common.h
diff --git a/src/amd/vulkan/radv_rt_shader.c
b/src/amd/vulkan/nir/radv_nir_rt_shader.c
similarity index 99%
rename from src/amd/vulkan/radv_rt_shader.c
rename to src/amd/vulkan/nir/radv_nir_rt_shader.c
index 9ce5bc202c3..4094cd9a6ff 100644
--- a/src/amd/vulkan/radv_rt_shader.c
+++ b/src/amd/vulkan/nir/radv_nir_rt_shader.c
@@ -27,9 +27,9 @@
#include "bvh/bvh.h"
#include "meta/radv_meta.h"
#include "nir/radv_nir.h"
+#include "nir/radv_nir_rt_common.h"
#include "ac_nir.h"
#include "radv_private.h"
-#include "radv_rt_common.h"
#include "radv_shader.h"
#include "vk_pipeline.h"
