diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index e1974261803..ec7c27bfdae 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -107,6 +107,8 @@ libradv_files = files( 'radv_cp_reg_shadowing.h', 'radv_cs.c', 'radv_cs.h', + 'radv_debug_nir.c', + 'radv_debug_nir.h', 'radv_debug.c', 'radv_debug.h', 'radv_device.c', @@ -149,8 +151,6 @@ libradv_files = files( 'radv_pipeline_layout.h', 'radv_pipeline_rt.c', 'radv_pipeline_rt.h', - 'radv_printf.c', - 'radv_printf.h', 'radv_queue.c', 'radv_queue.h', 'radv_radeon_winsys.h', diff --git a/src/amd/vulkan/meta/radv_meta.c b/src/amd/vulkan/meta/radv_meta.c index 0349dba7eb9..2df62368ef5 100644 --- a/src/amd/vulkan/meta/radv_meta.c +++ b/src/amd/vulkan/meta/radv_meta.c @@ -7,7 +7,7 @@ */ #include "radv_meta.h" -#include "radv_printf.h" +#include "radv_debug_nir.h" #include "vk_common_entrypoints.h" #include "vk_pipeline_cache.h" diff --git a/src/amd/vulkan/nir/radv_nir_lower_printf.c b/src/amd/vulkan/nir/radv_nir_lower_printf.c index 6055c3c0bab..6ece66fa643 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_printf.c +++ b/src/amd/vulkan/nir/radv_nir_lower_printf.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: MIT */ +#include "radv_debug_nir.h" #include "radv_nir.h" -#include "radv_printf.h" #include "util/u_printf.h" diff --git a/src/amd/vulkan/radv_printf.c b/src/amd/vulkan/radv_debug_nir.c similarity index 99% rename from src/amd/vulkan/radv_printf.c rename to src/amd/vulkan/radv_debug_nir.c index 32f24ab8636..a66333f793c 100644 --- a/src/amd/vulkan/radv_printf.c +++ b/src/amd/vulkan/radv_debug_nir.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ -#include "radv_printf.h" +#include "radv_debug_nir.h" #include "radv_device.h" #include "radv_physical_device.h" diff --git a/src/amd/vulkan/radv_printf.h b/src/amd/vulkan/radv_debug_nir.h similarity index 100% rename from src/amd/vulkan/radv_printf.h rename to src/amd/vulkan/radv_debug_nir.h diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 68aa9238f2b..cdd4ad27460 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -31,10 +31,10 @@ #include "util/u_debug.h" #include "radv_cs.h" #include "radv_debug.h" +#include "radv_debug_nir.h" #include "radv_entrypoints.h" #include "radv_formats.h" #include "radv_physical_device.h" -#include "radv_printf.h" #include "radv_rmv.h" #include "radv_shader.h" #include "radv_spm.h" diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h index dcf305884be..30a1c8ddd7c 100644 --- a/src/amd/vulkan/radv_device.h +++ b/src/amd/vulkan/radv_device.h @@ -17,8 +17,8 @@ #include "util/mesa-blake3.h" +#include "radv_debug_nir.h" #include "radv_pipeline.h" -#include "radv_printf.h" #include "radv_queue.h" #include "radv_radeon_winsys.h" #include "radv_rra.h" diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c index bca134aabbf..c7a08f76fae 100644 --- a/src/amd/vulkan/radv_queue.c +++ b/src/amd/vulkan/radv_queue.c @@ -13,9 +13,9 @@ #include "radv_cp_reg_shadowing.h" #include "radv_cs.h" #include "radv_debug.h" +#include "radv_debug_nir.h" #include "radv_device_memory.h" #include "radv_image.h" -#include "radv_printf.h" #include "radv_rmv.h" #include "vk_semaphore.h" #include "vk_sync.h" diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 2c74b085809..2b1e5f79d84 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -22,9 +22,9 @@ #include "util/u_atomic.h" #include "radv_cs.h" #include "radv_debug.h" +#include "radv_debug_nir.h" #include "radv_entrypoints.h" #include "radv_nir_to_llvm.h" -#include "radv_printf.h" #include "radv_sdma.h" #include "radv_shader_args.h"