Module: Mesa Branch: main Commit: 4dc40c3b644e61be00a1804e5a93c8fd554e3409 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4dc40c3b644e61be00a1804e5a93c8fd554e3409
Author: Samuel Pitoiset <[email protected]> Date: Tue Mar 21 08:32:14 2023 +0100 radv: move radv_meta_* to a new folder Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22046> --- src/amd/vulkan/layers/radv_rra_layer.c | 4 +-- src/amd/vulkan/meson.build | 36 +++++++++++----------- src/amd/vulkan/{ => meta}/radv_meta.c | 0 src/amd/vulkan/{ => meta}/radv_meta.h | 0 src/amd/vulkan/{ => meta}/radv_meta_blit.c | 0 src/amd/vulkan/{ => meta}/radv_meta_blit2d.c | 0 src/amd/vulkan/{ => meta}/radv_meta_buffer.c | 0 src/amd/vulkan/{ => meta}/radv_meta_bufimage.c | 0 src/amd/vulkan/{ => meta}/radv_meta_clear.c | 0 src/amd/vulkan/{ => meta}/radv_meta_copy.c | 0 .../vulkan/{ => meta}/radv_meta_copy_vrs_htile.c | 0 src/amd/vulkan/{ => meta}/radv_meta_dcc_retile.c | 0 src/amd/vulkan/{ => meta}/radv_meta_decompress.c | 0 src/amd/vulkan/{ => meta}/radv_meta_etc_decode.c | 0 src/amd/vulkan/{ => meta}/radv_meta_fast_clear.c | 0 src/amd/vulkan/{ => meta}/radv_meta_fmask_copy.c | 0 src/amd/vulkan/{ => meta}/radv_meta_fmask_expand.c | 0 src/amd/vulkan/{ => meta}/radv_meta_resolve.c | 0 src/amd/vulkan/{ => meta}/radv_meta_resolve_cs.c | 0 src/amd/vulkan/{ => meta}/radv_meta_resolve_fs.c | 0 src/amd/vulkan/radv_acceleration_structure.c | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 2 +- src/amd/vulkan/radv_device_generated_commands.c | 2 +- src/amd/vulkan/radv_pipeline.c | 2 +- src/amd/vulkan/radv_query.c | 2 +- src/amd/vulkan/radv_rt_shader.c | 2 +- src/amd/vulkan/radv_shader.c | 2 +- src/amd/vulkan/radv_wsi.c | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/amd/vulkan/layers/radv_rra_layer.c b/src/amd/vulkan/layers/radv_rra_layer.c index ab6fb5740a4..c09d586e09b 100644 --- a/src/amd/vulkan/layers/radv_rra_layer.c +++ b/src/amd/vulkan/layers/radv_rra_layer.c @@ -22,7 +22,7 @@ */ #include "util/u_process.h" -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radv_private.h" #include "vk_acceleration_structure.h" #include "vk_common_entrypoints.h" @@ -364,4 +364,4 @@ rra_DestroyAccelerationStructureKHR(VkDevice _device, VkAccelerationStructureKHR simple_mtx_unlock(&device->rra_trace.data_mtx); device->layer_dispatch.rra.DestroyAccelerationStructureKHR(_device, _structure, pAllocator); -} \ No newline at end of file +} diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 148df9fc0ca..3736f0c0b4a 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -52,6 +52,24 @@ libradv_files = files( 'layers/radv_rmv_layer.c', 'layers/radv_rra_layer.c', 'layers/radv_sqtt_layer.c', + 'meta/radv_meta.c', + 'meta/radv_meta.h', + 'meta/radv_meta_blit.c', + 'meta/radv_meta_blit2d.c', + 'meta/radv_meta_buffer.c', + 'meta/radv_meta_bufimage.c', + 'meta/radv_meta_clear.c', + 'meta/radv_meta_copy.c', + 'meta/radv_meta_copy_vrs_htile.c', + 'meta/radv_meta_dcc_retile.c', + 'meta/radv_meta_decompress.c', + 'meta/radv_meta_etc_decode.c', + 'meta/radv_meta_fast_clear.c', + 'meta/radv_meta_fmask_copy.c', + 'meta/radv_meta_fmask_expand.c', + 'meta/radv_meta_resolve.c', + 'meta/radv_meta_resolve_cs.c', + 'meta/radv_meta_resolve_fs.c', 'winsys/null/radv_null_bo.c', 'winsys/null/radv_null_bo.h', 'winsys/null/radv_null_cs.c', @@ -75,24 +93,6 @@ libradv_files = files( 'radv_formats.c', 'radv_image.c', 'radv_instance.c', - 'radv_meta.c', - 'radv_meta.h', - 'radv_meta_blit.c', - 'radv_meta_blit2d.c', - 'radv_meta_buffer.c', - 'radv_meta_bufimage.c', - 'radv_meta_clear.c', - 'radv_meta_copy.c', - 'radv_meta_copy_vrs_htile.c', - 'radv_meta_dcc_retile.c', - 'radv_meta_decompress.c', - 'radv_meta_etc_decode.c', - 'radv_meta_fast_clear.c', - 'radv_meta_fmask_copy.c', - 'radv_meta_fmask_expand.c', - 'radv_meta_resolve.c', - 'radv_meta_resolve_cs.c', - 'radv_meta_resolve_fs.c', 'radv_nir_apply_pipeline_layout.c', 'radv_nir_lower_abi.c', 'radv_nir_lower_ray_queries.c', diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/meta/radv_meta.c similarity index 100% rename from src/amd/vulkan/radv_meta.c rename to src/amd/vulkan/meta/radv_meta.c diff --git a/src/amd/vulkan/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h similarity index 100% rename from src/amd/vulkan/radv_meta.h rename to src/amd/vulkan/meta/radv_meta.h diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/meta/radv_meta_blit.c similarity index 100% rename from src/amd/vulkan/radv_meta_blit.c rename to src/amd/vulkan/meta/radv_meta_blit.c diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/meta/radv_meta_blit2d.c similarity index 100% rename from src/amd/vulkan/radv_meta_blit2d.c rename to src/amd/vulkan/meta/radv_meta_blit2d.c diff --git a/src/amd/vulkan/radv_meta_buffer.c b/src/amd/vulkan/meta/radv_meta_buffer.c similarity index 100% rename from src/amd/vulkan/radv_meta_buffer.c rename to src/amd/vulkan/meta/radv_meta_buffer.c diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/meta/radv_meta_bufimage.c similarity index 100% rename from src/amd/vulkan/radv_meta_bufimage.c rename to src/amd/vulkan/meta/radv_meta_bufimage.c diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/meta/radv_meta_clear.c similarity index 100% rename from src/amd/vulkan/radv_meta_clear.c rename to src/amd/vulkan/meta/radv_meta_clear.c diff --git a/src/amd/vulkan/radv_meta_copy.c b/src/amd/vulkan/meta/radv_meta_copy.c similarity index 100% rename from src/amd/vulkan/radv_meta_copy.c rename to src/amd/vulkan/meta/radv_meta_copy.c diff --git a/src/amd/vulkan/radv_meta_copy_vrs_htile.c b/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c similarity index 100% rename from src/amd/vulkan/radv_meta_copy_vrs_htile.c rename to src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c diff --git a/src/amd/vulkan/radv_meta_dcc_retile.c b/src/amd/vulkan/meta/radv_meta_dcc_retile.c similarity index 100% rename from src/amd/vulkan/radv_meta_dcc_retile.c rename to src/amd/vulkan/meta/radv_meta_dcc_retile.c diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/meta/radv_meta_decompress.c similarity index 100% rename from src/amd/vulkan/radv_meta_decompress.c rename to src/amd/vulkan/meta/radv_meta_decompress.c diff --git a/src/amd/vulkan/radv_meta_etc_decode.c b/src/amd/vulkan/meta/radv_meta_etc_decode.c similarity index 100% rename from src/amd/vulkan/radv_meta_etc_decode.c rename to src/amd/vulkan/meta/radv_meta_etc_decode.c diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/meta/radv_meta_fast_clear.c similarity index 100% rename from src/amd/vulkan/radv_meta_fast_clear.c rename to src/amd/vulkan/meta/radv_meta_fast_clear.c diff --git a/src/amd/vulkan/radv_meta_fmask_copy.c b/src/amd/vulkan/meta/radv_meta_fmask_copy.c similarity index 100% rename from src/amd/vulkan/radv_meta_fmask_copy.c rename to src/amd/vulkan/meta/radv_meta_fmask_copy.c diff --git a/src/amd/vulkan/radv_meta_fmask_expand.c b/src/amd/vulkan/meta/radv_meta_fmask_expand.c similarity index 100% rename from src/amd/vulkan/radv_meta_fmask_expand.c rename to src/amd/vulkan/meta/radv_meta_fmask_expand.c diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/meta/radv_meta_resolve.c similarity index 100% rename from src/amd/vulkan/radv_meta_resolve.c rename to src/amd/vulkan/meta/radv_meta_resolve.c diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/meta/radv_meta_resolve_cs.c similarity index 100% rename from src/amd/vulkan/radv_meta_resolve_cs.c rename to src/amd/vulkan/meta/radv_meta_resolve_cs.c diff --git a/src/amd/vulkan/radv_meta_resolve_fs.c b/src/amd/vulkan/meta/radv_meta_resolve_fs.c similarity index 100% rename from src/amd/vulkan/radv_meta_resolve_fs.c rename to src/amd/vulkan/meta/radv_meta_resolve_fs.c diff --git a/src/amd/vulkan/radv_acceleration_structure.c b/src/amd/vulkan/radv_acceleration_structure.c index a3c50d1573c..241ba5b3f94 100644 --- a/src/amd/vulkan/radv_acceleration_structure.c +++ b/src/amd/vulkan/radv_acceleration_structure.c @@ -25,7 +25,7 @@ #include "nir_builder.h" #include "radv_cs.h" -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radix_sort/radv_radix_sort.h" diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index df2c0b0aa3f..337368a5405 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -27,7 +27,7 @@ #include "radv_cs.h" #include "radv_debug.h" -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radv_private.h" #include "radv_radeon_winsys.h" #include "radv_shader.h" diff --git a/src/amd/vulkan/radv_device_generated_commands.c b/src/amd/vulkan/radv_device_generated_commands.c index a05a91cbb59..5a7c66b481f 100644 --- a/src/amd/vulkan/radv_device_generated_commands.c +++ b/src/amd/vulkan/radv_device_generated_commands.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radv_private.h" #include "nir_builder.h" diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index c5cc3a02eb4..1e1a48459dc 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -35,7 +35,7 @@ #include "util/u_atomic.h" #include "radv_cs.h" #include "radv_debug.h" -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radv_private.h" #include "radv_shader.h" #include "radv_shader_args.h" diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index c176d5b254b..213f2a4633e 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -33,7 +33,7 @@ #include "util/u_atomic.h" #include "vulkan/vulkan_core.h" #include "radv_cs.h" -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radv_private.h" #include "sid.h" #include "vk_acceleration_structure.h" diff --git a/src/amd/vulkan/radv_rt_shader.c b/src/amd/vulkan/radv_rt_shader.c index 8dab68db6d2..7d1e036a19c 100644 --- a/src/amd/vulkan/radv_rt_shader.c +++ b/src/amd/vulkan/radv_rt_shader.c @@ -25,7 +25,7 @@ #include "nir/nir_builder.h" #include "bvh/bvh.h" -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radv_private.h" #include "radv_rt_common.h" #include "radv_shader.h" diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 01761d9559f..689e23df252 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -36,7 +36,7 @@ #include "util/streaming-load-memcpy.h" #include "radv_cs.h" #include "radv_debug.h" -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radv_private.h" #include "radv_shader_args.h" diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index ecfee143e73..597a158b54e 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/src/amd/vulkan/radv_wsi.c @@ -25,7 +25,7 @@ #include "util/macros.h" #include "radv_debug.h" -#include "radv_meta.h" +#include "meta/radv_meta.h" #include "radv_private.h" #include "vk_fence.h" #include "vk_semaphore.h"
