From bfb6c41b648d50a5f6f41e3113f1efaba68555ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 22 Apr 2026 00:00:52 -0400 Subject: [PATCH] amd: remove unnecessary and transitive #includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by clang tools. See: https://clangd.llvm.org/guides/include-cleaner struct ac_cmdbuf had to be moved to ac_cmdbuf_base.h because we can't include ac_cmdbuf.h->sid.h->amdgfxregs.h in radeon_winsys.h for r300. Reviewed-by: Samuel Pitoiset Reviewed-by: Timur Kristóf Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/common/ac_binary.c | 1 - src/amd/common/ac_binary.h | 1 - src/amd/common/ac_cmdbuf.h | 11 ++-------- src/amd/common/ac_cmdbuf_base.h | 20 +++++++++++++++++++ src/amd/common/ac_cmdbuf_sdma.h | 3 ++- src/amd/common/ac_descriptors.c | 2 +- src/amd/common/ac_descriptors.h | 2 -- src/amd/common/ac_formats.c | 2 +- src/amd/common/ac_gpu_info.c | 4 +--- src/amd/common/ac_gpu_info.h | 3 ++- src/amd/common/ac_guardband.c | 1 + src/amd/common/ac_msgpack.c | 1 - src/amd/common/ac_perfcounter.h | 2 +- src/amd/common/ac_perfcounter_gfx10.c | 2 -- src/amd/common/ac_perfcounter_gfx103.c | 2 -- src/amd/common/ac_rtld.c | 1 - src/amd/common/ac_rtld.h | 1 - src/amd/common/ac_shader_util.c | 4 +--- src/amd/common/ac_shader_util.h | 2 +- src/amd/common/ac_surface.c | 6 ++---- src/amd/common/ac_surface.h | 2 +- src/amd/common/ac_surface_meta_address_test.c | 5 ----- src/amd/common/ac_surface_modifier_test.c | 2 +- src/amd/common/ac_surface_test.h | 1 - src/amd/common/ac_uvd_dec.c | 2 +- src/amd/common/ac_vcn_enc.c | 1 - src/amd/common/ac_vcn_enc.h | 1 + src/amd/common/ac_video_dec.h | 1 - src/amd/common/amd_family.c | 1 - src/amd/common/gfx10_format_table.h | 2 +- src/amd/common/meson.build | 1 + src/amd/common/nir/ac_nir_helpers.h | 3 --- .../nir/ac_nir_lower_image_opcodes_cdna.c | 1 - src/amd/common/nir/ac_nir_lower_ngg.c | 1 - src/amd/common/nir/ac_nir_lower_ngg_gs.c | 2 -- src/amd/common/nir/ac_nir_lower_ps_early.c | 2 -- src/amd/common/nir/ac_nir_lower_ps_late.c | 2 +- .../nir/ac_nir_lower_taskmesh_io_to_mem.c | 2 -- .../common/nir/ac_nir_lower_tess_io_to_mem.c | 1 - src/amd/common/nir/ac_nir_prerast_utils.c | 2 +- src/amd/common/nir/ac_nir_surface.c | 3 +-- src/amd/common/nir/ac_nir_surface.h | 1 - src/amd/common/virtio/amdgpu_virtio_bo.c | 4 ---- src/amd/compiler/aco_assembler.cpp | 2 +- src/amd/compiler/aco_dead_code_analysis.cpp | 1 - src/amd/compiler/aco_insert_delay_alu.cpp | 1 - src/amd/compiler/aco_insert_waitcnt.cpp | 2 +- src/amd/compiler/aco_interface.cpp | 2 -- src/amd/compiler/aco_lower_phis.cpp | 1 - src/amd/compiler/aco_lower_to_hw_instr.cpp | 2 +- src/amd/compiler/aco_optimizer.cpp | 1 - src/amd/compiler/aco_optimizer_postRA.cpp | 2 -- src/amd/compiler/aco_print_asm.cpp | 3 --- src/amd/compiler/aco_print_ir.cpp | 2 +- src/amd/compiler/aco_reduce_assign.cpp | 1 - src/amd/compiler/aco_repair_ssa.cpp | 2 -- src/amd/compiler/aco_spill.cpp | 3 --- src/amd/compiler/aco_util.h | 1 - src/amd/compiler/aco_validate.cpp | 1 - .../instruction_selection/aco_isel_setup.cpp | 1 - src/amd/compiler/tests/framework.h | 4 +--- src/amd/compiler/tests/helpers.h | 1 - src/amd/compiler/tests/test_assembler.cpp | 2 +- src/amd/compiler/tests/test_hard_clause.cpp | 2 +- src/amd/drm-shim/amdgpu_noop_drm_shim.c | 2 -- src/amd/llvm/ac_llvm_build.c | 3 +-- src/amd/llvm/ac_llvm_build.h | 1 - src/amd/llvm/ac_llvm_helper.cpp | 1 - src/amd/llvm/ac_llvm_util.c | 16 +++++++-------- src/amd/llvm/ac_nir_to_llvm.c | 1 - src/amd/llvm/ac_nir_to_llvm.h | 3 --- src/amd/llvm/ac_shader_abi.h | 2 -- .../packets/parse_cp_pm4_table_data_json.py | 1 + src/amd/vulkan/bvh/build_interface.h | 1 - src/amd/vulkan/layers/radv_sqtt_layer.c | 2 +- src/amd/vulkan/meta/radv_meta.c | 1 + src/amd/vulkan/meta/radv_meta.h | 5 ----- src/amd/vulkan/meta/radv_meta_astc_decode.c | 1 - src/amd/vulkan/meta/radv_meta_blit.c | 2 +- src/amd/vulkan/meta/radv_meta_buffer.c | 1 + src/amd/vulkan/meta/radv_meta_clear.c | 1 - src/amd/vulkan/meta/radv_meta_clear_hiz.c | 1 + src/amd/vulkan/meta/radv_meta_copy.c | 1 - .../vulkan/meta/radv_meta_copy_indirect_cs.c | 2 +- .../vulkan/meta/radv_meta_copy_indirect_fs.c | 2 +- .../vulkan/meta/radv_meta_copy_vrs_htile.c | 2 +- src/amd/vulkan/meta/radv_meta_dcc_retile.c | 1 + src/amd/vulkan/meta/radv_meta_decompress.c | 3 ++- src/amd/vulkan/meta/radv_meta_etc_decode.c | 4 ---- src/amd/vulkan/meta/radv_meta_fast_clear.c | 1 + src/amd/vulkan/meta/radv_meta_fmask_copy.c | 1 + src/amd/vulkan/meta/radv_meta_fmask_expand.c | 2 +- src/amd/vulkan/meta/radv_meta_resolve_fs.c | 1 + src/amd/vulkan/nir/radv_nir_lower_abi.c | 1 - .../vulkan/nir/radv_nir_lower_descriptors.c | 3 +-- .../nir/radv_nir_lower_fs_barycentric.c | 6 ++++-- .../nir/radv_nir_lower_hit_attrib_derefs.c | 1 - .../vulkan/nir/radv_nir_lower_ray_queries.c | 3 ++- src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c | 1 - src/amd/vulkan/nir/radv_nir_opt_fs_builtins.c | 5 ++++- .../nir/radv_nir_remap_color_attachment.c | 3 ++- src/amd/vulkan/nir/radv_nir_rt_common.c | 4 +++- src/amd/vulkan/nir/radv_nir_rt_common.h | 3 --- src/amd/vulkan/nir/radv_nir_rt_stage_cps.c | 1 + .../vulkan/nir/radv_nir_rt_stage_functions.c | 1 + .../vulkan/nir/radv_nir_rt_traversal_shader.c | 1 - .../nir/radv_nir_trim_fs_color_exports.c | 1 - src/amd/vulkan/radv_acceleration_structure.c | 1 - src/amd/vulkan/radv_aco_shader_info.h | 1 - src/amd/vulkan/radv_android.h | 2 +- src/amd/vulkan/radv_buffer_view.c | 1 - src/amd/vulkan/radv_cmd_buffer.c | 2 -- src/amd/vulkan/radv_cp_reg_shadowing.c | 1 - src/amd/vulkan/radv_cs.c | 2 -- src/amd/vulkan/radv_cs.h | 1 - src/amd/vulkan/radv_debug.c | 1 - src/amd/vulkan/radv_descriptor_set.c | 1 - src/amd/vulkan/radv_descriptor_set.h | 2 -- src/amd/vulkan/radv_descriptors.c | 1 - src/amd/vulkan/radv_descriptors.h | 10 +++++++++- src/amd/vulkan/radv_device.c | 15 -------------- src/amd/vulkan/radv_device.h | 2 -- src/amd/vulkan/radv_device_memory.c | 1 - src/amd/vulkan/radv_dgc.c | 2 +- src/amd/vulkan/radv_image.c | 4 ---- src/amd/vulkan/radv_image.h | 1 + src/amd/vulkan/radv_image_view.c | 2 -- src/amd/vulkan/radv_instance.c | 1 - src/amd/vulkan/radv_nir_to_llvm.c | 3 --- src/amd/vulkan/radv_perfcounter.h | 2 -- src/amd/vulkan/radv_physical_device.c | 3 +-- src/amd/vulkan/radv_pipeline.c | 10 +--------- src/amd/vulkan/radv_pipeline.h | 2 -- src/amd/vulkan/radv_pipeline_binary.c | 6 ++---- src/amd/vulkan/radv_pipeline_cache.c | 3 --- src/amd/vulkan/radv_pipeline_compute.c | 11 ---------- src/amd/vulkan/radv_pipeline_graphics.c | 8 -------- src/amd/vulkan/radv_pipeline_graphics.h | 3 +-- src/amd/vulkan/radv_pipeline_rt.c | 3 --- src/amd/vulkan/radv_radeon_winsys.h | 2 -- src/amd/vulkan/radv_rmv.h | 2 -- src/amd/vulkan/radv_sdma.c | 2 -- src/amd/vulkan/radv_shader.c | 2 -- src/amd/vulkan/radv_shader_args.h | 1 - src/amd/vulkan/radv_shader_info.h | 1 - src/amd/vulkan/radv_spm.c | 2 -- src/amd/vulkan/radv_spm.h | 1 - src/amd/vulkan/radv_sqtt.c | 2 -- src/amd/vulkan/radv_wsi.c | 16 ++++++++++----- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c | 1 - src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h | 1 - .../vulkan/winsys/amdgpu/radv_amdgpu_winsys.c | 3 +-- src/gallium/drivers/radeonsi/radeon_uvd_enc.c | 1 - src/gallium/drivers/radeonsi/radeon_vce.c | 2 +- src/gallium/drivers/radeonsi/radeon_vce.h | 4 ++-- src/gallium/drivers/radeonsi/radeon_vcn.c | 1 + src/gallium/drivers/radeonsi/radeon_vcn.h | 5 +++-- src/gallium/drivers/radeonsi/radeon_vcn_enc.h | 3 +-- .../drivers/radeonsi/radeon_vcn_enc_1_2.c | 3 --- .../drivers/radeonsi/radeon_vcn_enc_2_0.c | 3 --- .../drivers/radeonsi/radeon_vcn_enc_3_0.c | 3 --- .../drivers/radeonsi/radeon_vcn_enc_4_0.c | 1 + src/gallium/drivers/radeonsi/si_build_pm4.h | 3 --- src/gallium/drivers/radeonsi/si_clear.c | 1 - src/gallium/drivers/radeonsi/si_compute.c | 1 - .../drivers/radeonsi/si_compute_blit.c | 1 - src/gallium/drivers/radeonsi/si_cp_dma.c | 1 + .../drivers/radeonsi/si_cp_reg_shadowing.c | 4 +--- src/gallium/drivers/radeonsi/si_cp_utils.c | 3 ++- src/gallium/drivers/radeonsi/si_debug.c | 5 ----- .../drivers/radeonsi/si_debug_gfx_compute.c | 7 ------- src/gallium/drivers/radeonsi/si_fence.c | 3 ++- src/gallium/drivers/radeonsi/si_gfx_cs.c | 1 + src/gallium/drivers/radeonsi/si_mesh_shader.c | 2 -- .../drivers/radeonsi/si_nir_kill_outputs.c | 2 +- .../drivers/radeonsi/si_nir_lower_resource.c | 1 - src/gallium/drivers/radeonsi/si_perfcounter.c | 1 + src/gallium/drivers/radeonsi/si_perfetto.h | 3 --- src/gallium/drivers/radeonsi/si_pipe.c | 1 - src/gallium/drivers/radeonsi/si_pm4.c | 2 -- src/gallium/drivers/radeonsi/si_pm4.h | 1 - src/gallium/drivers/radeonsi/si_query.c | 1 + .../drivers/radeonsi/si_sdma_copy_image.c | 4 +--- src/gallium/drivers/radeonsi/si_shader.c | 2 +- src/gallium/drivers/radeonsi/si_shader.h | 1 - src/gallium/drivers/radeonsi/si_shader_info.c | 1 - src/gallium/drivers/radeonsi/si_shader_info.h | 1 + src/gallium/drivers/radeonsi/si_shader_llvm.c | 3 --- .../drivers/radeonsi/si_shader_llvm_gs.c | 3 --- .../drivers/radeonsi/si_shader_llvm_ps.c | 1 - .../drivers/radeonsi/si_shader_llvm_tess.c | 1 - src/gallium/drivers/radeonsi/si_shader_nir.c | 4 +--- .../drivers/radeonsi/si_shader_variant_info.c | 1 - .../drivers/radeonsi/si_shaderlib_nir.c | 2 +- src/gallium/drivers/radeonsi/si_sqtt.c | 2 +- src/gallium/drivers/radeonsi/si_state.c | 2 -- src/gallium/drivers/radeonsi/si_state.h | 3 --- .../drivers/radeonsi/si_state_binning.c | 1 - .../drivers/radeonsi/si_state_draw.cpp | 2 +- .../drivers/radeonsi/si_state_shaders.cpp | 3 +-- src/gallium/drivers/radeonsi/si_texture.c | 6 ------ src/gallium/drivers/radeonsi/si_vpe.h | 3 +-- src/gallium/include/winsys/radeon_winsys.h | 5 +++-- src/gallium/winsys/amdgpu/drm/amdgpu_userq.c | 1 + 204 files changed, 154 insertions(+), 362 deletions(-) create mode 100644 src/amd/common/ac_cmdbuf_base.h diff --git a/src/amd/common/ac_binary.c b/src/amd/common/ac_binary.c index a836dc23579..4d31f3e1f93 100644 --- a/src/amd/common/ac_binary.c +++ b/src/amd/common/ac_binary.c @@ -8,7 +8,6 @@ #include "ac_gpu_info.h" #include "util/u_math.h" -#include "util/u_memory.h" #include #include diff --git a/src/amd/common/ac_binary.h b/src/amd/common/ac_binary.h index b58a10eaa3e..46eb3f6d412 100644 --- a/src/amd/common/ac_binary.h +++ b/src/amd/common/ac_binary.h @@ -9,7 +9,6 @@ #include #include -#include #ifdef __cplusplus extern "C" { diff --git a/src/amd/common/ac_cmdbuf.h b/src/amd/common/ac_cmdbuf.h index ba3f182ea0b..282d4b9dee9 100644 --- a/src/amd/common/ac_cmdbuf.h +++ b/src/amd/common/ac_cmdbuf.h @@ -9,7 +9,9 @@ #include +#include "ac_cmdbuf_base.h" #include "ac_pm4.h" +#include "sid.h" #include "util/bitset.h" @@ -17,15 +19,6 @@ extern "C" { #endif -struct ac_cmdbuf { - uint32_t cdw; /* Number of used dwords. */ - uint32_t max_dw; /* Maximum number of dwords. */ - uint32_t reserved_dw; /* Number of dwords reserved. */ - uint32_t *buf; /* The base pointer of the chunk. */ - - bool context_roll; -}; - /* The structure layout is identical to a pair of registers in SET_*_REG_PAIRS_PACKED. */ struct ac_gfx11_reg_pair { union { diff --git a/src/amd/common/ac_cmdbuf_base.h b/src/amd/common/ac_cmdbuf_base.h new file mode 100644 index 00000000000..59adbb4f239 --- /dev/null +++ b/src/amd/common/ac_cmdbuf_base.h @@ -0,0 +1,20 @@ +/* Copyright 2026 Valve Corporation + * SPDX-License-Identifier: MIT + */ + +#ifndef AC_CMDBUF_BASE_H +#define AC_CMDBUF_BASE_H + +#include +#include + +struct ac_cmdbuf { + uint32_t cdw; /* Number of used dwords. */ + uint32_t max_dw; /* Maximum number of dwords. */ + uint32_t reserved_dw; /* Number of dwords reserved. */ + uint32_t *buf; /* The base pointer of the chunk. */ + + bool context_roll; +}; + +#endif diff --git a/src/amd/common/ac_cmdbuf_sdma.h b/src/amd/common/ac_cmdbuf_sdma.h index 4443ff34922..7e32457d98c 100644 --- a/src/amd/common/ac_cmdbuf_sdma.h +++ b/src/amd/common/ac_cmdbuf_sdma.h @@ -8,7 +8,8 @@ #ifndef AC_CMDBUF_SDMA_H #define AC_CMDBUF_SDMA_H -#include "util/format/u_format.h" +#include +#include "util/format/u_formats.h" enum sdma_version; struct radeon_info; diff --git a/src/amd/common/ac_descriptors.c b/src/amd/common/ac_descriptors.c index b07207a52e5..4165cd61d16 100644 --- a/src/amd/common/ac_descriptors.c +++ b/src/amd/common/ac_descriptors.c @@ -11,7 +11,7 @@ #include "ac_surface.h" #include "gfx10_format_table.h" -#include "sid.h" +#include "amdgfxregs.h" #include "util/u_math.h" #include "util/format/u_format.h" diff --git a/src/amd/common/ac_descriptors.h b/src/amd/common/ac_descriptors.h index f938edc593c..666c0bd6093 100644 --- a/src/amd/common/ac_descriptors.h +++ b/src/amd/common/ac_descriptors.h @@ -11,8 +11,6 @@ #include "ac_gpu_info.h" #include "ac_surface.h" -#include "util/format/u_format.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/src/amd/common/ac_formats.c b/src/amd/common/ac_formats.c index 85c4250ef22..d4868fa2b52 100644 --- a/src/amd/common/ac_formats.c +++ b/src/amd/common/ac_formats.c @@ -9,7 +9,7 @@ #include "ac_formats.h" #include "ac_gpu_info.h" -#include "sid.h" +#include "amdgfxregs.h" uint32_t ac_translate_buffer_numformat(const struct util_format_description *desc, diff --git a/src/amd/common/ac_gpu_info.c b/src/amd/common/ac_gpu_info.c index b47c2beed28..513dc775416 100644 --- a/src/amd/common/ac_gpu_info.c +++ b/src/amd/common/ac_gpu_info.c @@ -13,12 +13,10 @@ #include "addrlib/src/amdgpu_asic_addr.h" #include "amd_family.h" -#include "sid.h" +#include "amdgfxregs.h" #include "util/macros.h" -#include "util/u_cpu_detect.h" #include "util/u_math.h" #include "util/os_misc.h" -#include "util/bitset.h" #include #include diff --git a/src/amd/common/ac_gpu_info.h b/src/amd/common/ac_gpu_info.h index be59bc9e760..3d27e8ef860 100644 --- a/src/amd/common/ac_gpu_info.h +++ b/src/amd/common/ac_gpu_info.h @@ -8,7 +8,8 @@ #define AC_GPU_INFO_H #include -#include "util/macros.h" +#include +#include #include "amd_family.h" #ifdef __cplusplus diff --git a/src/amd/common/ac_guardband.c b/src/amd/common/ac_guardband.c index 5c3fa9cb894..bdd1de6ff4a 100644 --- a/src/amd/common/ac_guardband.c +++ b/src/amd/common/ac_guardband.c @@ -9,6 +9,7 @@ #include "ac_gpu_info.h" #include "ac_guardband.h" +#include "util/macros.h" void ac_compute_guardband(const struct radeon_info *info, int minx, int miny, diff --git a/src/amd/common/ac_msgpack.c b/src/amd/common/ac_msgpack.c index 6db4e10d5a8..eeccff3f9b1 100644 --- a/src/amd/common/ac_msgpack.c +++ b/src/amd/common/ac_msgpack.c @@ -13,7 +13,6 @@ */ #include -#include #include #include #include diff --git a/src/amd/common/ac_perfcounter.h b/src/amd/common/ac_perfcounter.h index 454911eed94..5779fe6cdae 100644 --- a/src/amd/common/ac_perfcounter.h +++ b/src/amd/common/ac_perfcounter.h @@ -9,7 +9,7 @@ #include -#include "sid.h" +#include "amdgfxregs.h" #include "ac_gpu_info.h" diff --git a/src/amd/common/ac_perfcounter_gfx10.c b/src/amd/common/ac_perfcounter_gfx10.c index 375280f1f3e..8f41ffc5b4b 100644 --- a/src/amd/common/ac_perfcounter_gfx10.c +++ b/src/amd/common/ac_perfcounter_gfx10.c @@ -4,11 +4,9 @@ * SPDX-License-Identifier: MIT */ -#include "ac_gpu_info.h" #include "ac_perfcounter.h" #include "ac_spm.h" -#include "util/u_memory.h" #include "util/macros.h" /* gfx10_CB */ diff --git a/src/amd/common/ac_perfcounter_gfx103.c b/src/amd/common/ac_perfcounter_gfx103.c index 31b63129c99..d3fbd13be6b 100644 --- a/src/amd/common/ac_perfcounter_gfx103.c +++ b/src/amd/common/ac_perfcounter_gfx103.c @@ -4,11 +4,9 @@ * SPDX-License-Identifier: MIT */ -#include "ac_gpu_info.h" #include "ac_perfcounter.h" #include "ac_spm.h" -#include "util/u_memory.h" #include "util/macros.h" /* gfx103_CB */ diff --git a/src/amd/common/ac_rtld.c b/src/amd/common/ac_rtld.c index 579c8efdac6..132cc507515 100644 --- a/src/amd/common/ac_rtld.c +++ b/src/amd/common/ac_rtld.c @@ -9,7 +9,6 @@ #include "ac_binary.h" #include "ac_gpu_info.h" #include "util/compiler.h" -#include "util/u_dynarray.h" #include "util/u_math.h" #include diff --git a/src/amd/common/ac_rtld.h b/src/amd/common/ac_rtld.h index 818d44ab18c..45dc2b343e5 100644 --- a/src/amd/common/ac_rtld.h +++ b/src/amd/common/ac_rtld.h @@ -8,7 +8,6 @@ #define AC_RTLD_H #include "compiler/shader_enums.h" -#include "util/u_dynarray.h" #include "amd_family.h" #include diff --git a/src/amd/common/ac_shader_util.c b/src/amd/common/ac_shader_util.c index 27ed8721c24..98da14565b4 100644 --- a/src/amd/common/ac_shader_util.c +++ b/src/amd/common/ac_shader_util.c @@ -7,12 +7,10 @@ #include "ac_shader_util.h" #include "ac_gpu_info.h" -#include "sid.h" +#include "amdgfxregs.h" #include "util/u_math.h" #include -#include -#include unsigned ac_get_spi_shader_z_format(bool writes_z, bool writes_stencil, bool writes_samplemask, bool writes_mrt0_alpha) diff --git a/src/amd/common/ac_shader_util.h b/src/amd/common/ac_shader_util.h index 0a3a6a687eb..77069fdb099 100644 --- a/src/amd/common/ac_shader_util.h +++ b/src/amd/common/ac_shader_util.h @@ -10,7 +10,7 @@ #include "ac_binary.h" #include "amd_family.h" #include "compiler/shader_enums.h" -#include "util/format/u_format.h" +#include "util/format/u_formats.h" #include "util/u_math.h" #include diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 3e4695bbef0..32907f31dbc 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -12,16 +12,14 @@ #include "addrlib/inc/addrinterface.h" #include "addrlib/src/amdgpu_asic_addr.h" #include "amd_family.h" -#include "sid.h" -#include "util/hash_table.h" +#include "amdgfxregs.h" #include "util/macros.h" #include "util/simple_mtx.h" #include "util/u_atomic.h" #include "util/format/u_format.h" #include "util/u_math.h" -#include "util/u_memory.h" -#include +#include #include #include diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h index 7c3bcd9a1e4..3f6705ef10a 100644 --- a/src/amd/common/ac_surface.h +++ b/src/amd/common/ac_surface.h @@ -8,7 +8,7 @@ #define AC_SURFACE_H #include "amd_family.h" -#include "util/format/u_format.h" +#include "util/format/u_formats.h" #include #include diff --git a/src/amd/common/ac_surface_meta_address_test.c b/src/amd/common/ac_surface_meta_address_test.c index 4d8eafa3683..38f42fc60f6 100644 --- a/src/amd/common/ac_surface_meta_address_test.c +++ b/src/amd/common/ac_surface_meta_address_test.c @@ -13,15 +13,10 @@ #include #include -#include "drm-uapi/amdgpu_drm.h" -#include "drm-uapi/drm_fourcc.h" - #include "ac_surface.h" #include "util/macros.h" #include "util/u_atomic.h" #include "util/u_math.h" -#include "util/u_vector.h" -#include "util/mesa-blake3.h" #include "addrlib/inc/addrinterface.h" #include "ac_surface_test.h" diff --git a/src/amd/common/ac_surface_modifier_test.c b/src/amd/common/ac_surface_modifier_test.c index e9dd6867e5d..96df367979c 100644 --- a/src/amd/common/ac_surface_modifier_test.c +++ b/src/amd/common/ac_surface_modifier_test.c @@ -6,10 +6,10 @@ #include #include -#include "drm-uapi/amdgpu_drm.h" #include "drm-uapi/drm_fourcc.h" #include "ac_surface.h" +#include "util/format/u_format.h" #include "util/macros.h" #include "util/u_math.h" #include "util/u_vector.h" diff --git a/src/amd/common/ac_surface_test.h b/src/amd/common/ac_surface_test.h index 7f9bea21745..bea0427e678 100644 --- a/src/amd/common/ac_surface_test.h +++ b/src/amd/common/ac_surface_test.h @@ -10,7 +10,6 @@ #include "ac_gpu_info.h" #include "amdgfxregs.h" -#include "addrlib/src/amdgpu_asic_addr.h" #include "amdgpu_devices.h" #include "ac_linux_drm.h" diff --git a/src/amd/common/ac_uvd_dec.c b/src/amd/common/ac_uvd_dec.c index 5ab5286db60..e39e51c500c 100644 --- a/src/amd/common/ac_uvd_dec.c +++ b/src/amd/common/ac_uvd_dec.c @@ -12,7 +12,7 @@ #include "ac_cmdbuf.h" #include "util/os_time.h" #include "util/detect_os.h" -#include "util/bitpack_helpers.h" +#include "util/u_math.h" #include "util/u_memory.h" #if DETECT_OS_POSIX diff --git a/src/amd/common/ac_vcn_enc.c b/src/amd/common/ac_vcn_enc.c index 358ce59b11f..511b92464f2 100644 --- a/src/amd/common/ac_vcn_enc.c +++ b/src/amd/common/ac_vcn_enc.c @@ -6,7 +6,6 @@ * **************************************************************************/ -#include #include #include "ac_vcn_enc.h" diff --git a/src/amd/common/ac_vcn_enc.h b/src/amd/common/ac_vcn_enc.h index a90d3854327..33066e53906 100644 --- a/src/amd/common/ac_vcn_enc.h +++ b/src/amd/common/ac_vcn_enc.h @@ -28,6 +28,7 @@ #ifndef AC_VCN_ENC_H #define AC_VCN_ENC_H +#include #include "amd_family.h" #define RENCODE_IB_OP_INITIALIZE 0x01000001 diff --git a/src/amd/common/ac_video_dec.h b/src/amd/common/ac_video_dec.h index dd2b10c55f2..e77c6d7afff 100644 --- a/src/amd/common/ac_video_dec.h +++ b/src/amd/common/ac_video_dec.h @@ -9,7 +9,6 @@ #include "ac_video.h" #include "ac_gpu_info.h" -#include "util/format/u_format.h" #define AC_VIDEO_DEC_MAX_REFS 17 diff --git a/src/amd/common/amd_family.c b/src/amd/common/amd_family.c index 8e4804429e9..6337f1404c0 100644 --- a/src/amd/common/amd_family.c +++ b/src/amd/common/amd_family.c @@ -5,7 +5,6 @@ */ #include "amd_family.h" -#include "addrlib/src/amdgpu_asic_addr.h" #include "util/macros.h" #include "ac_gpu_info.h" diff --git a/src/amd/common/gfx10_format_table.h b/src/amd/common/gfx10_format_table.h index 4c1477178c3..1f0592a2d7d 100644 --- a/src/amd/common/gfx10_format_table.h +++ b/src/amd/common/gfx10_format_table.h @@ -8,7 +8,7 @@ #define GFX10_FORMAT_TABLE_H #include "util/format/u_formats.h" -#include "ac_gpu_info.h" +#include "amd_family.h" #include diff --git a/src/amd/common/meson.build b/src/amd/common/meson.build index ed404104359..b07322d64cf 100644 --- a/src/amd/common/meson.build +++ b/src/amd/common/meson.build @@ -98,6 +98,7 @@ amd_common_files = files( 'ac_binary.h', 'ac_cmdbuf.c', 'ac_cmdbuf.h', + 'ac_cmdbuf_base.h', 'ac_cmdbuf_cp.c', 'ac_cmdbuf_cp.h', 'ac_cmdbuf_sdma.c', diff --git a/src/amd/common/nir/ac_nir_helpers.h b/src/amd/common/nir/ac_nir_helpers.h index 7ecb70053ae..cf23f9ac525 100644 --- a/src/amd/common/nir/ac_nir_helpers.h +++ b/src/amd/common/nir/ac_nir_helpers.h @@ -8,9 +8,6 @@ #ifndef AC_NIR_HELPERS_H #define AC_NIR_HELPERS_H -#include "ac_hw_stage.h" -#include "ac_shader_args.h" -#include "ac_shader_util.h" #include "ac_nir.h" #include "nir_defines.h" diff --git a/src/amd/common/nir/ac_nir_lower_image_opcodes_cdna.c b/src/amd/common/nir/ac_nir_lower_image_opcodes_cdna.c index 8a94ff49e22..1de26986b05 100644 --- a/src/amd/common/nir/ac_nir_lower_image_opcodes_cdna.c +++ b/src/amd/common/nir/ac_nir_lower_image_opcodes_cdna.c @@ -21,7 +21,6 @@ #include "ac_nir.h" #include "nir_builder.h" -#include "amdgfxregs.h" static nir_def *get_field(nir_builder *b, nir_def *desc, unsigned index, unsigned mask) { diff --git a/src/amd/common/nir/ac_nir_lower_ngg.c b/src/amd/common/nir/ac_nir_lower_ngg.c index 7bcbc28cb45..f40b379fdef 100644 --- a/src/amd/common/nir/ac_nir_lower_ngg.c +++ b/src/amd/common/nir/ac_nir_lower_ngg.c @@ -7,7 +7,6 @@ #include "ac_nir.h" #include "ac_nir_helpers.h" #include "ac_gpu_info.h" -#include "amdgfxregs.h" #include "nir_builder.h" #include "nir_xfb_info.h" #include "util/u_math.h" diff --git a/src/amd/common/nir/ac_nir_lower_ngg_gs.c b/src/amd/common/nir/ac_nir_lower_ngg_gs.c index 0965000ce33..4f61d5010bb 100644 --- a/src/amd/common/nir/ac_nir_lower_ngg_gs.c +++ b/src/amd/common/nir/ac_nir_lower_ngg_gs.c @@ -7,11 +7,9 @@ #include "ac_nir.h" #include "ac_nir_helpers.h" #include "ac_gpu_info.h" -#include "amdgfxregs.h" #include "nir_builder.h" #include "nir_xfb_info.h" #include "util/u_math.h" -#include "util/u_vector.h" typedef struct { diff --git a/src/amd/common/nir/ac_nir_lower_ps_early.c b/src/amd/common/nir/ac_nir_lower_ps_early.c index 4c7b076b496..c8c2a307485 100644 --- a/src/amd/common/nir/ac_nir_lower_ps_early.c +++ b/src/amd/common/nir/ac_nir_lower_ps_early.c @@ -13,9 +13,7 @@ */ #include "ac_nir.h" -#include "sid.h" #include "nir_builder.h" -#include "nir_builtin_builder.h" typedef struct { const ac_nir_lower_ps_early_options *options; diff --git a/src/amd/common/nir/ac_nir_lower_ps_late.c b/src/amd/common/nir/ac_nir_lower_ps_late.c index f0ad9ac1292..1ee62dd8508 100644 --- a/src/amd/common/nir/ac_nir_lower_ps_late.c +++ b/src/amd/common/nir/ac_nir_lower_ps_late.c @@ -11,7 +11,7 @@ */ #include "ac_nir.h" -#include "sid.h" +#include "amdgfxregs.h" #include "nir_builder.h" #include "nir_builtin_builder.h" diff --git a/src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c b/src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c index 04a796cf84d..0cc85818e9f 100644 --- a/src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c +++ b/src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c @@ -7,8 +7,6 @@ #include "ac_gpu_info.h" #include "ac_nir.h" #include "nir_builder.h" -#include "amdgfxregs.h" -#include "util/u_math.h" /* * These NIR passes are used to lower NIR cross-stage I/O intrinsics diff --git a/src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c b/src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c index 156e3f839b6..698f4ebb72b 100644 --- a/src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c +++ b/src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c @@ -10,7 +10,6 @@ #include "ac_shader_util.h" #include "nir_builder.h" #include "nir_tcs_info.h" -#include "util/u_math.h" /* * These NIR passes are used to lower NIR cross-stage I/O intrinsics into the diff --git a/src/amd/common/nir/ac_nir_prerast_utils.c b/src/amd/common/nir/ac_nir_prerast_utils.c index fc5bcae64e7..a1f884e40cc 100644 --- a/src/amd/common/nir/ac_nir_prerast_utils.c +++ b/src/amd/common/nir/ac_nir_prerast_utils.c @@ -6,7 +6,7 @@ #include "ac_nir.h" #include "ac_nir_helpers.h" -#include "sid.h" +#include "amdgfxregs.h" #include "nir_builder.h" #include "nir_xfb_info.h" diff --git a/src/amd/common/nir/ac_nir_surface.c b/src/amd/common/nir/ac_nir_surface.c index a868a8555e0..175f4f34c28 100644 --- a/src/amd/common/nir/ac_nir_surface.c +++ b/src/amd/common/nir/ac_nir_surface.c @@ -5,9 +5,8 @@ */ #include "ac_nir_surface.h" -#include "ac_gpu_info.h" #include "nir_builder.h" -#include "sid.h" +#include "amdgfxregs.h" static nir_def *gfx10_nir_meta_addr_from_coord(nir_builder *b, uint32_t gb_addr_config, const struct gfx9_meta_equation *equation, diff --git a/src/amd/common/nir/ac_nir_surface.h b/src/amd/common/nir/ac_nir_surface.h index 31ff9f15b32..b1256b19efd 100644 --- a/src/amd/common/nir/ac_nir_surface.h +++ b/src/amd/common/nir/ac_nir_surface.h @@ -10,7 +10,6 @@ #include "ac_surface.h" #include "amd_family.h" #include "nir_defines.h" -#include "util/format/u_format.h" #ifdef __cplusplus extern "C" { diff --git a/src/amd/common/virtio/amdgpu_virtio_bo.c b/src/amd/common/virtio/amdgpu_virtio_bo.c index b2fe2764520..a7e4fa0ecae 100644 --- a/src/amd/common/virtio/amdgpu_virtio_bo.c +++ b/src/amd/common/virtio/amdgpu_virtio_bo.c @@ -7,12 +7,8 @@ #include "drm-uapi/amdgpu_drm.h" #include "amdgpu_virtio_private.h" -#include "ac_linux_drm.h" -#include "util/list.h" #include "util/log.h" #include "util/os_mman.h" -#include "util/os_time.h" -#include "util/u_math.h" #include "sid.h" #include diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp index 2b9b6c1c449..04c7034c01c 100644 --- a/src/amd/compiler/aco_assembler.cpp +++ b/src/amd/compiler/aco_assembler.cpp @@ -7,7 +7,7 @@ #include "aco_builder.h" #include "aco_ir.h" -#include "common/sid.h" +#include "common/amdgfxregs.h" #include "util/memstream.h" diff --git a/src/amd/compiler/aco_dead_code_analysis.cpp b/src/amd/compiler/aco_dead_code_analysis.cpp index 4f3c90b5907..13aa7af4122 100644 --- a/src/amd/compiler/aco_dead_code_analysis.cpp +++ b/src/amd/compiler/aco_dead_code_analysis.cpp @@ -6,7 +6,6 @@ #include "aco_ir.h" -#include #include /* diff --git a/src/amd/compiler/aco_insert_delay_alu.cpp b/src/amd/compiler/aco_insert_delay_alu.cpp index 1e9e9bc9c9d..455d9bb91e2 100644 --- a/src/amd/compiler/aco_insert_delay_alu.cpp +++ b/src/amd/compiler/aco_insert_delay_alu.cpp @@ -8,7 +8,6 @@ #include "aco_ir.h" #include -#include #include namespace aco { diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp index 18cb53dd7a0..7bae3fb4428 100644 --- a/src/amd/compiler/aco_insert_waitcnt.cpp +++ b/src/amd/compiler/aco_insert_waitcnt.cpp @@ -7,7 +7,7 @@ #include "aco_builder.h" #include "aco_ir.h" -#include "common/sid.h" +#include "common/amdgfxregs.h" #include #include diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp index e162fdb70c6..63312b26cf4 100644 --- a/src/amd/compiler/aco_interface.cpp +++ b/src/amd/compiler/aco_interface.cpp @@ -12,8 +12,6 @@ #include "ac_gpu_info.h" #include "nir.h" -#include -#include #include using namespace aco; diff --git a/src/amd/compiler/aco_lower_phis.cpp b/src/amd/compiler/aco_lower_phis.cpp index 918fde853da..2205d1326eb 100644 --- a/src/amd/compiler/aco_lower_phis.cpp +++ b/src/amd/compiler/aco_lower_phis.cpp @@ -10,7 +10,6 @@ #include "util/enum_operators.h" #include -#include #include namespace aco { diff --git a/src/amd/compiler/aco_lower_to_hw_instr.cpp b/src/amd/compiler/aco_lower_to_hw_instr.cpp index de9e2085eb1..8bc97931789 100644 --- a/src/amd/compiler/aco_lower_to_hw_instr.cpp +++ b/src/amd/compiler/aco_lower_to_hw_instr.cpp @@ -7,7 +7,7 @@ #include "aco_builder.h" #include "aco_ir.h" -#include "common/sid.h" +#include "common/amdgfxregs.h" #include #include diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp index 2c75ae656bf..c3d2d935246 100644 --- a/src/amd/compiler/aco_optimizer.cpp +++ b/src/amd/compiler/aco_optimizer.cpp @@ -11,7 +11,6 @@ #include "util/memstream.h" #include -#include #include namespace aco { diff --git a/src/amd/compiler/aco_optimizer_postRA.cpp b/src/amd/compiler/aco_optimizer_postRA.cpp index d25f44a61bb..b2cb6388235 100644 --- a/src/amd/compiler/aco_optimizer_postRA.cpp +++ b/src/amd/compiler/aco_optimizer_postRA.cpp @@ -4,12 +4,10 @@ * SPDX-License-Identifier: MIT */ -#include "aco_builder.h" #include "aco_ir.h" #include #include -#include #include namespace aco { diff --git a/src/amd/compiler/aco_print_asm.cpp b/src/amd/compiler/aco_print_asm.cpp index 2c040d88c9f..01aee2a32c4 100644 --- a/src/amd/compiler/aco_print_asm.cpp +++ b/src/amd/compiler/aco_print_asm.cpp @@ -6,8 +6,6 @@ #include "aco_ir.h" -#include "util/u_debug.h" - #include "amd_family.h" #if AMD_LLVM_AVAILABLE @@ -22,7 +20,6 @@ #endif #include -#include #include namespace aco { diff --git a/src/amd/compiler/aco_print_ir.cpp b/src/amd/compiler/aco_print_ir.cpp index 76649085ee6..8823e4650d3 100644 --- a/src/amd/compiler/aco_print_ir.cpp +++ b/src/amd/compiler/aco_print_ir.cpp @@ -8,7 +8,7 @@ #include "aco_ir.h" #include "common/ac_shader_util.h" -#include "common/sid.h" +#include "common/amdgfxregs.h" #include diff --git a/src/amd/compiler/aco_reduce_assign.cpp b/src/amd/compiler/aco_reduce_assign.cpp index e2ede914ce0..460406ac0a6 100644 --- a/src/amd/compiler/aco_reduce_assign.cpp +++ b/src/amd/compiler/aco_reduce_assign.cpp @@ -5,7 +5,6 @@ * SPDX-License-Identifier: MIT */ -#include "aco_builder.h" #include "aco_ir.h" #include diff --git a/src/amd/compiler/aco_repair_ssa.cpp b/src/amd/compiler/aco_repair_ssa.cpp index 8c69559c85c..3431ec7e83d 100644 --- a/src/amd/compiler/aco_repair_ssa.cpp +++ b/src/amd/compiler/aco_repair_ssa.cpp @@ -6,8 +6,6 @@ #include "aco_ir.h" -#include - namespace aco { namespace { diff --git a/src/amd/compiler/aco_spill.cpp b/src/amd/compiler/aco_spill.cpp index c8b2467504d..d9627fa2da0 100644 --- a/src/amd/compiler/aco_spill.cpp +++ b/src/amd/compiler/aco_spill.cpp @@ -9,9 +9,6 @@ #include "aco_ir.h" #include "aco_util.h" -#include "common/ac_descriptors.h" -#include "common/sid.h" - #include #include #include diff --git a/src/amd/compiler/aco_util.h b/src/amd/compiler/aco_util.h index ca1f62b74d9..82d754f155a 100644 --- a/src/amd/compiler/aco_util.h +++ b/src/amd/compiler/aco_util.h @@ -22,7 +22,6 @@ #include #include #include -#include namespace aco { diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp index 0a4c80dab6e..70cadef4112 100644 --- a/src/amd/compiler/aco_validate.cpp +++ b/src/amd/compiler/aco_validate.cpp @@ -11,7 +11,6 @@ #include #include -#include #include namespace aco { diff --git a/src/amd/compiler/instruction_selection/aco_isel_setup.cpp b/src/amd/compiler/instruction_selection/aco_isel_setup.cpp index c4d28a198f3..645d6199e72 100644 --- a/src/amd/compiler/instruction_selection/aco_isel_setup.cpp +++ b/src/amd/compiler/instruction_selection/aco_isel_setup.cpp @@ -6,7 +6,6 @@ #include "aco_instruction_selection.h" #include "aco_interface.h" -#include "aco_nir_call_attribs.h" #include "nir_builder.h" #include "nir_control_flow.h" diff --git a/src/amd/compiler/tests/framework.h b/src/amd/compiler/tests/framework.h index 4be5da1e176..7f27e60ee98 100644 --- a/src/amd/compiler/tests/framework.h +++ b/src/amd/compiler/tests/framework.h @@ -5,12 +5,10 @@ */ #ifndef ACO_TEST_COMMON_H #define ACO_TEST_COMMON_H -#include "aco_builder.h" -#include "aco_ir.h" +#include "aco_builder.h" #include "util/macros.h" -#include "ac_shader_util.h" #include "amd_family.h" #include #include diff --git a/src/amd/compiler/tests/helpers.h b/src/amd/compiler/tests/helpers.h index c8181001264..d20d3e200d1 100644 --- a/src/amd/compiler/tests/helpers.h +++ b/src/amd/compiler/tests/helpers.h @@ -9,7 +9,6 @@ #include "vulkan/vulkan.h" #include "framework.h" -#include "ac_gpu_info.h" #include "nir_builder.h" #include diff --git a/src/amd/compiler/tests/test_assembler.cpp b/src/amd/compiler/tests/test_assembler.cpp index cce1d21dbf9..f260e3ad41b 100644 --- a/src/amd/compiler/tests/test_assembler.cpp +++ b/src/amd/compiler/tests/test_assembler.cpp @@ -6,7 +6,7 @@ #include #include "helpers.h" -#include "sid.h" +#include "amdgfxregs.h" using namespace aco; diff --git a/src/amd/compiler/tests/test_hard_clause.cpp b/src/amd/compiler/tests/test_hard_clause.cpp index 50bf52ea889..7d1b4b896e3 100644 --- a/src/amd/compiler/tests/test_hard_clause.cpp +++ b/src/amd/compiler/tests/test_hard_clause.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: MIT */ #include "helpers.h" -#include "sid.h" +#include "amdgfxregs.h" using namespace aco; diff --git a/src/amd/drm-shim/amdgpu_noop_drm_shim.c b/src/amd/drm-shim/amdgpu_noop_drm_shim.c index 1ac8a396e46..c1577048d0b 100644 --- a/src/amd/drm-shim/amdgpu_noop_drm_shim.c +++ b/src/amd/drm-shim/amdgpu_noop_drm_shim.c @@ -5,9 +5,7 @@ #include #include -#include #include "common/amdgpu_devices.h" -#include "common/amd_family.h" #include "drm-shim/amdgpu_noop_drm_shim.h" #include "drm-shim/drm_shim.h" #include "drm-uapi/amdgpu_drm.h" diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c index 166d46e57fe..2e2bc1e1750 100644 --- a/src/amd/llvm/ac_llvm_build.c +++ b/src/amd/llvm/ac_llvm_build.c @@ -9,13 +9,12 @@ #include "ac_nir.h" #include "ac_llvm_util.h" #include "ac_shader_util.h" -#include "c11/threads.h" #include "shader_enums.h" #include "sid.h" #include "util/bitscan.h" +#include "util/format/u_format.h" #include "util/macros.h" #include "util/u_atomic.h" -#include "util/u_math.h" #include #include diff --git a/src/amd/llvm/ac_llvm_build.h b/src/amd/llvm/ac_llvm_build.h index 9866b6dcad7..4a0762ecbe6 100644 --- a/src/amd/llvm/ac_llvm_build.h +++ b/src/amd/llvm/ac_llvm_build.h @@ -7,7 +7,6 @@ #define AC_LLVM_BUILD_H #include "ac_llvm_util.h" -#include "ac_shader_abi.h" #include "ac_shader_args.h" #include "ac_shader_util.h" #include "amd_family.h" diff --git a/src/amd/llvm/ac_llvm_helper.cpp b/src/amd/llvm/ac_llvm_helper.cpp index c726f20b166..c14213d22eb 100644 --- a/src/amd/llvm/ac_llvm_helper.cpp +++ b/src/amd/llvm/ac_llvm_helper.cpp @@ -35,7 +35,6 @@ * with our #define in include/c99_compat.h */ -#include "ac_binary.h" #include "ac_llvm_util.h" #include "ac_llvm_build.h" #include "util/macros.h" diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c index 8d54fa0f861..b8e7fa690f0 100644 --- a/src/amd/llvm/ac_llvm_util.c +++ b/src/amd/llvm/ac_llvm_util.c @@ -3,20 +3,18 @@ * * SPDX-License-Identifier: MIT */ -/* based on pieces from si_pipe.c and radeon_llvm_emit.c */ -#include "ac_llvm_util.h" - -#include "ac_llvm_build.h" -#include "c11/threads.h" -#include "util/bitscan.h" -#include "util/u_math.h" -#include -#include #include #include #include +#include +#include + +#include "c11/threads.h" +#include "ac_llvm_util.h" +#include "ac_llvm_build.h" + static void ac_init_llvm_target(void) { LLVMInitializeAMDGPUTargetInfo(); diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c index 6d3c1622de8..842152ea72a 100644 --- a/src/amd/llvm/ac_nir_to_llvm.c +++ b/src/amd/llvm/ac_nir_to_llvm.c @@ -13,7 +13,6 @@ #include "ac_shader_util.h" #include "ac_nir.h" #include "nir/nir.h" -#include "nir/nir_deref.h" #include "sid.h" #include "util/bitscan.h" #include "util/u_math.h" diff --git a/src/amd/llvm/ac_nir_to_llvm.h b/src/amd/llvm/ac_nir_to_llvm.h index a9598319e0d..0252dcfa0a7 100644 --- a/src/amd/llvm/ac_nir_to_llvm.h +++ b/src/amd/llvm/ac_nir_to_llvm.h @@ -7,10 +7,7 @@ #ifndef AC_NIR_TO_LLVM_H #define AC_NIR_TO_LLVM_H -#include "amd_family.h" -#include "compiler/shader_enums.h" #include -#include "llvm-c/TargetMachine.h" #include diff --git a/src/amd/llvm/ac_shader_abi.h b/src/amd/llvm/ac_shader_abi.h index 820415c95ba..7d3a787cd92 100644 --- a/src/amd/llvm/ac_shader_abi.h +++ b/src/amd/llvm/ac_shader_abi.h @@ -7,10 +7,8 @@ #ifndef AC_SHADER_ABI_H #define AC_SHADER_ABI_H -#include "ac_shader_args.h" #include "ac_shader_util.h" #include "compiler/shader_enums.h" -#include "nir_defines.h" #include #include diff --git a/src/amd/packets/parse_cp_pm4_table_data_json.py b/src/amd/packets/parse_cp_pm4_table_data_json.py index 842d26d54ce..7ee2909b53f 100644 --- a/src/amd/packets/parse_cp_pm4_table_data_json.py +++ b/src/amd/packets/parse_cp_pm4_table_data_json.py @@ -690,6 +690,7 @@ def print_packet_parser(is_header): print('#include "amd_cp_print_packet_%s.h"' % gfx_version) print('#include "amd_cp_packets_%s.h"' % gfx_version) print('#include "amdgfxregs.h"') + print('#include "util/macros.h"') # Generate enum-to-string tables. if not is_header: diff --git a/src/amd/vulkan/bvh/build_interface.h b/src/amd/vulkan/bvh/build_interface.h index 21890826600..1fc7b03f733 100644 --- a/src/amd/vulkan/bvh/build_interface.h +++ b/src/amd/vulkan/bvh/build_interface.h @@ -13,7 +13,6 @@ #include "build_helpers.h" #else #include -#include "bvh.h" #define REF(type) uint64_t #define VOID_REF uint64_t #endif diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c index bb6447bfcd9..33c3350940f 100644 --- a/src/amd/vulkan/layers/radv_sqtt_layer.c +++ b/src/amd/vulkan/layers/radv_sqtt_layer.c @@ -11,12 +11,12 @@ #include "radv_pipeline_rt.h" #include "radv_queue.h" #include "radv_shader.h" -#include "radv_spm.h" #include "radv_sqtt.h" #include "vk_semaphore.h" #include "ac_rgp.h" #include "ac_sqtt.h" +#include "util/u_memory.h" void radv_sqtt_emit_relocated_shaders(struct radv_cmd_buffer *cmd_buffer, struct radv_graphics_pipeline *pipeline) diff --git a/src/amd/vulkan/meta/radv_meta.c b/src/amd/vulkan/meta/radv_meta.c index 46115860275..7cf0a076ddb 100644 --- a/src/amd/vulkan/meta/radv_meta.c +++ b/src/amd/vulkan/meta/radv_meta.c @@ -8,6 +8,7 @@ #include "radv_meta.h" #include "radv_debug_nir.h" +#include "radv_shader_object.h" #include "vk_common_entrypoints.h" #include "vk_pipeline_cache.h" diff --git a/src/amd/vulkan/meta/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h index 6f2f5334402..57099b7d317 100644 --- a/src/amd/vulkan/meta/radv_meta.h +++ b/src/amd/vulkan/meta/radv_meta.h @@ -20,15 +20,10 @@ #include "radv_physical_device.h" #include "radv_pipeline.h" #include "radv_pipeline_compute.h" -#include "radv_pipeline_graphics.h" #include "radv_queue.h" #include "radv_shader.h" -#include "radv_shader_object.h" #include "radv_sqtt.h" -#include "vk_render_pass.h" -#include "vk_shader_module.h" - #ifdef __cplusplus extern "C" { #endif diff --git a/src/amd/vulkan/meta/radv_meta_astc_decode.c b/src/amd/vulkan/meta/radv_meta_astc_decode.c index 4cc867bf63c..60823928b44 100644 --- a/src/amd/vulkan/meta/radv_meta_astc_decode.c +++ b/src/amd/vulkan/meta/radv_meta_astc_decode.c @@ -7,7 +7,6 @@ #include #include "radv_meta.h" -#include "sid.h" #include "vk_format.h" static void diff --git a/src/amd/vulkan/meta/radv_meta_blit.c b/src/amd/vulkan/meta/radv_meta_blit.c index a9002ea9066..97ed198a69d 100644 --- a/src/amd/vulkan/meta/radv_meta_blit.c +++ b/src/amd/vulkan/meta/radv_meta_blit.c @@ -7,7 +7,7 @@ #include "nir/radv_meta_nir.h" #include "radv_meta.h" #include "radv_sampler.h" -#include "vk_command_pool.h" +#include "vk_shader_module.h" static enum glsl_sampler_dim translate_sampler_dim(VkImageType type) diff --git a/src/amd/vulkan/meta/radv_meta_buffer.c b/src/amd/vulkan/meta/radv_meta_buffer.c index 0aaaec1a6af..34bc116da8a 100644 --- a/src/amd/vulkan/meta/radv_meta_buffer.c +++ b/src/amd/vulkan/meta/radv_meta_buffer.c @@ -12,6 +12,7 @@ #include "radv_debug.h" #include "radv_meta.h" #include "radv_sdma.h" +#include "vk_shader_module.h" #include "radv_cs.h" diff --git a/src/amd/vulkan/meta/radv_meta_clear.c b/src/amd/vulkan/meta/radv_meta_clear.c index 8a04463c00d..10d5cef0c92 100644 --- a/src/amd/vulkan/meta/radv_meta_clear.c +++ b/src/amd/vulkan/meta/radv_meta_clear.c @@ -5,7 +5,6 @@ */ #include "nir/radv_meta_nir.h" -#include "radv_debug.h" #include "radv_entrypoints.h" #include "radv_formats.h" #include "radv_meta.h" diff --git a/src/amd/vulkan/meta/radv_meta_clear_hiz.c b/src/amd/vulkan/meta/radv_meta_clear_hiz.c index b055b23e00e..29ef3bf2398 100644 --- a/src/amd/vulkan/meta/radv_meta_clear_hiz.c +++ b/src/amd/vulkan/meta/radv_meta_clear_hiz.c @@ -7,6 +7,7 @@ #include "nir/radv_meta_nir.h" #include "radv_entrypoints.h" #include "radv_meta.h" +#include "vk_shader_module.h" static VkResult get_clear_hiz_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out) diff --git a/src/amd/vulkan/meta/radv_meta_copy.c b/src/amd/vulkan/meta/radv_meta_copy.c index a465b21e0ae..d8349cdf5e9 100644 --- a/src/amd/vulkan/meta/radv_meta_copy.c +++ b/src/amd/vulkan/meta/radv_meta_copy.c @@ -4,7 +4,6 @@ * SPDX-License-Identifier: MIT */ -#include "nir/radv_meta_nir.h" #include "radv_formats.h" #include "radv_meta.h" #include "radv_sdma.h" diff --git a/src/amd/vulkan/meta/radv_meta_copy_indirect_cs.c b/src/amd/vulkan/meta/radv_meta_copy_indirect_cs.c index 93fc243e570..e6a4ee4ae0e 100644 --- a/src/amd/vulkan/meta/radv_meta_copy_indirect_cs.c +++ b/src/amd/vulkan/meta/radv_meta_copy_indirect_cs.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: MIT */ #include "nir/radv_meta_nir.h" -#include "radv_cs.h" #include "radv_formats.h" #include "radv_meta.h" +#include "vk_shader_module.h" /* Copy memory->memory. */ static VkResult diff --git a/src/amd/vulkan/meta/radv_meta_copy_indirect_fs.c b/src/amd/vulkan/meta/radv_meta_copy_indirect_fs.c index 6fc9572cb14..4ebba0231fa 100644 --- a/src/amd/vulkan/meta/radv_meta_copy_indirect_fs.c +++ b/src/amd/vulkan/meta/radv_meta_copy_indirect_fs.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: MIT */ #include "nir/radv_meta_nir.h" -#include "radv_cs.h" #include "radv_formats.h" #include "radv_meta.h" +#include "vk_shader_module.h" static VkResult get_gfx_copy_memory_to_image_indirect_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out) diff --git a/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c b/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c index bb3f71b4e77..3bce7db77fb 100644 --- a/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c +++ b/src/amd/vulkan/meta/radv_meta_copy_vrs_htile.c @@ -7,7 +7,7 @@ #include "nir/radv_meta_nir.h" #include "ac_surface.h" #include "radv_meta.h" -#include "vk_format.h" +#include "vk_shader_module.h" static VkResult get_pipeline(struct radv_device *device, struct radv_image *image, VkPipeline *pipeline_out, diff --git a/src/amd/vulkan/meta/radv_meta_dcc_retile.c b/src/amd/vulkan/meta/radv_meta_dcc_retile.c index 43a421a8c3d..9cc23732ac8 100644 --- a/src/amd/vulkan/meta/radv_meta_dcc_retile.c +++ b/src/amd/vulkan/meta/radv_meta_dcc_retile.c @@ -8,6 +8,7 @@ #include "ac_surface.h" #include "radv_meta.h" +#include "vk_shader_module.h" static VkResult get_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out) diff --git a/src/amd/vulkan/meta/radv_meta_decompress.c b/src/amd/vulkan/meta/radv_meta_decompress.c index 40fecc643e7..fe435889d3d 100644 --- a/src/amd/vulkan/meta/radv_meta_decompress.c +++ b/src/amd/vulkan/meta/radv_meta_decompress.c @@ -9,7 +9,8 @@ #include "nir/radv_meta_nir.h" #include "radv_meta.h" -#include "sid.h" + +#include "vk_shader_module.h" struct radv_htile_expand_key { enum radv_meta_object_key_type type; diff --git a/src/amd/vulkan/meta/radv_meta_etc_decode.c b/src/amd/vulkan/meta/radv_meta_etc_decode.c index 7f1085bdfd1..46e51a0a646 100644 --- a/src/amd/vulkan/meta/radv_meta_etc_decode.c +++ b/src/amd/vulkan/meta/radv_meta_etc_decode.c @@ -7,11 +7,7 @@ #include #include -#include "nir/nir_builder.h" -#include "radv_cs.h" #include "radv_meta.h" -#include "sid.h" -#include "vk_format.h" static VkPipeline radv_get_etc_decode_pipeline(struct radv_cmd_buffer *cmd_buffer, bool indirect) diff --git a/src/amd/vulkan/meta/radv_meta_fast_clear.c b/src/amd/vulkan/meta/radv_meta_fast_clear.c index b8657e91597..e2f26adfd43 100644 --- a/src/amd/vulkan/meta/radv_meta_fast_clear.c +++ b/src/amd/vulkan/meta/radv_meta_fast_clear.c @@ -10,6 +10,7 @@ #include "nir/radv_meta_nir.h" #include "radv_cs.h" #include "radv_meta.h" +#include "vk_shader_module.h" enum radv_color_op { FAST_CLEAR_ELIMINATE, diff --git a/src/amd/vulkan/meta/radv_meta_fmask_copy.c b/src/amd/vulkan/meta/radv_meta_fmask_copy.c index 806ce531b31..b5a8b0c1388 100644 --- a/src/amd/vulkan/meta/radv_meta_fmask_copy.c +++ b/src/amd/vulkan/meta/radv_meta_fmask_copy.c @@ -7,6 +7,7 @@ #include "nir/radv_meta_nir.h" #include "radv_formats.h" #include "radv_meta.h" +#include "vk_shader_module.h" static VkResult get_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out) diff --git a/src/amd/vulkan/meta/radv_meta_fmask_expand.c b/src/amd/vulkan/meta/radv_meta_fmask_expand.c index 0d95e1b62ee..126536cb101 100644 --- a/src/amd/vulkan/meta/radv_meta_fmask_expand.c +++ b/src/amd/vulkan/meta/radv_meta_fmask_expand.c @@ -8,7 +8,7 @@ #include "nir/radv_meta_nir.h" #include "radv_formats.h" #include "radv_meta.h" -#include "vk_format.h" +#include "vk_shader_module.h" static VkResult get_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out) diff --git a/src/amd/vulkan/meta/radv_meta_resolve_fs.c b/src/amd/vulkan/meta/radv_meta_resolve_fs.c index ed5e6deac27..a4ff9d19d12 100644 --- a/src/amd/vulkan/meta/radv_meta_resolve_fs.c +++ b/src/amd/vulkan/meta/radv_meta_resolve_fs.c @@ -11,6 +11,7 @@ #include "radv_entrypoints.h" #include "radv_meta.h" #include "vk_format.h" +#include "vk_shader_module.h" static VkResult get_gfx_resolve_pipeline_layout(struct radv_device *device, VkPipelineLayout *layout_out) diff --git a/src/amd/vulkan/nir/radv_nir_lower_abi.c b/src/amd/vulkan/nir/radv_nir_lower_abi.c index 685d6387903..82e91040c1f 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_abi.c +++ b/src/amd/vulkan/nir/radv_nir_lower_abi.c @@ -12,7 +12,6 @@ #include "radv_pipeline_graphics.h" #include "radv_shader.h" #include "radv_shader_args.h" -#include "sid.h" #define GET_SGPR_FIELD_NIR(arg, field) \ ac_nir_unpack_arg(b, &s->args->ac, arg, field##__SHIFT, util_bitcount(field##__MASK)) diff --git a/src/amd/vulkan/nir/radv_nir_lower_descriptors.c b/src/amd/vulkan/nir/radv_nir_lower_descriptors.c index a55a335cac7..b555d8dc8ce 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_descriptors.c +++ b/src/amd/vulkan/nir/radv_nir_lower_descriptors.c @@ -9,11 +9,10 @@ #include "nir.h" #include "nir_builder.h" #include "radv_descriptor_set.h" -#include "radv_descriptors.h" #include "radv_nir.h" +#include "radv_physical_device.h" #include "radv_shader.h" #include "radv_shader_args.h" -#include "sid.h" typedef struct { enum amd_gfx_level gfx_level; diff --git a/src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c b/src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c index bedca21571d..ac5043414c0 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c +++ b/src/amd/vulkan/nir/radv_nir_lower_fs_barycentric.c @@ -7,8 +7,10 @@ #include "nir/nir.h" #include "nir/nir_builder.h" #include "radv_nir.h" -#include "radv_pipeline_graphics.h" -#include "sid.h" +#include "radv_pipeline.h" +#include "radv_shader.h" + +#include "amdgfxregs.h" typedef struct { bool dynamic_rasterization_samples; diff --git a/src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c b/src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c index 526b55ac85e..84fe1e6150a 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c +++ b/src/amd/vulkan/nir/radv_nir_lower_hit_attrib_derefs.c @@ -7,7 +7,6 @@ #include "nir.h" #include "nir_builder.h" #include "nir_deref.h" -#include "radv_constants.h" #include "radv_nir.h" typedef nir_def *(*load_intrin_cb)(nir_builder *b, unsigned base); 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 e77d3adacc0..1c48a816207 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c +++ b/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c @@ -11,8 +11,9 @@ #include "bvh/bvh.h" #include "nir/radv_nir_rt_common.h" -#include "radv_debug.h" +#include "radv_device.h" #include "radv_nir.h" +#include "radv_physical_device.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/nir/radv_nir_lower_vs_inputs.c b/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c index 7335e3c4425..a4fa99fe8f2 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c +++ b/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c @@ -8,7 +8,6 @@ #include "nir.h" #include "nir_builder.h" #include "nir_deref.h" -#include "radv_constants.h" #include "radv_nir.h" #include "radv_shader.h" #include "radv_shader_args.h" diff --git a/src/amd/vulkan/nir/radv_nir_opt_fs_builtins.c b/src/amd/vulkan/nir/radv_nir_opt_fs_builtins.c index 94931e4967e..fde89d5b898 100644 --- a/src/amd/vulkan/nir/radv_nir_opt_fs_builtins.c +++ b/src/amd/vulkan/nir/radv_nir_opt_fs_builtins.c @@ -6,8 +6,11 @@ #include "nir/nir.h" #include "nir/nir_builder.h" + +#include "amdgfxregs.h" #include "radv_nir.h" -#include "radv_pipeline_graphics.h" +#include "radv_pipeline.h" +#include "radv_shader.h" typedef struct { const struct radv_graphics_state_key *gfx; diff --git a/src/amd/vulkan/nir/radv_nir_remap_color_attachment.c b/src/amd/vulkan/nir/radv_nir_remap_color_attachment.c index 22db45ab714..2de9d45e758 100644 --- a/src/amd/vulkan/nir/radv_nir_remap_color_attachment.c +++ b/src/amd/vulkan/nir/radv_nir_remap_color_attachment.c @@ -8,7 +8,8 @@ #include "nir/nir_builder.h" #include "radv_constants.h" #include "radv_nir.h" -#include "radv_pipeline_graphics.h" +#include "radv_pipeline.h" +#include "radv_shader.h" #include "vk_graphics_state.h" static bool diff --git a/src/amd/vulkan/nir/radv_nir_rt_common.c b/src/amd/vulkan/nir/radv_nir_rt_common.c index 3065d92a126..dbf97873452 100644 --- a/src/amd/vulkan/nir/radv_nir_rt_common.c +++ b/src/amd/vulkan/nir/radv_nir_rt_common.c @@ -7,7 +7,9 @@ #include "nir/radv_nir_rt_common.h" #include "bvh/bvh.h" #include "nir_builder.h" -#include "radv_debug.h" + +#include "radv_device.h" +#include "radv_physical_device.h" static nir_def *build_node_to_addr(const struct radv_compiler_info *compiler_info, nir_builder *b, nir_def *node, bool skip_type_and); diff --git a/src/amd/vulkan/nir/radv_nir_rt_common.h b/src/amd/vulkan/nir/radv_nir_rt_common.h index 0442b2f63b7..648926a9442 100644 --- a/src/amd/vulkan/nir/radv_nir_rt_common.h +++ b/src/amd/vulkan/nir/radv_nir_rt_common.h @@ -8,9 +8,6 @@ #define RADV_RT_COMMON_H #include "nir/nir_defines.h" -#include "vk_nir_convert_ycbcr.h" - -#include "compiler/spirv/spirv.h" struct radv_compiler_info; diff --git a/src/amd/vulkan/nir/radv_nir_rt_stage_cps.c b/src/amd/vulkan/nir/radv_nir_rt_stage_cps.c index e73b0110120..b3142ecf33e 100644 --- a/src/amd/vulkan/nir/radv_nir_rt_stage_cps.c +++ b/src/amd/vulkan/nir/radv_nir_rt_stage_cps.c @@ -5,6 +5,7 @@ * SPDX-License-Identifier: MIT */ +#include "compiler/spirv/spirv.h" #include "nir/nir.h" #include "nir/nir_builder.h" diff --git a/src/amd/vulkan/nir/radv_nir_rt_stage_functions.c b/src/amd/vulkan/nir/radv_nir_rt_stage_functions.c index 14cb05d5f30..16f38be588c 100644 --- a/src/amd/vulkan/nir/radv_nir_rt_stage_functions.c +++ b/src/amd/vulkan/nir/radv_nir_rt_stage_functions.c @@ -5,6 +5,7 @@ * SPDX-License-Identifier: MIT */ +#include "compiler/spirv/spirv.h" #include "nir/nir.h" #include "nir/nir_builder.h" diff --git a/src/amd/vulkan/nir/radv_nir_rt_traversal_shader.c b/src/amd/vulkan/nir/radv_nir_rt_traversal_shader.c index 9a191448093..a7b84a4bbc8 100644 --- a/src/amd/vulkan/nir/radv_nir_rt_traversal_shader.c +++ b/src/amd/vulkan/nir/radv_nir_rt_traversal_shader.c @@ -8,7 +8,6 @@ #include "bvh/bvh.h" #include "nir/radv_nir_rt_common.h" #include "nir/radv_nir_rt_stage_common.h" -#include "nir/radv_nir_rt_stage_cps.h" #include "nir/radv_nir_rt_traversal_shader.h" #include "aco_nir_call_attribs.h" diff --git a/src/amd/vulkan/nir/radv_nir_trim_fs_color_exports.c b/src/amd/vulkan/nir/radv_nir_trim_fs_color_exports.c index 6ae301f34c4..d522406e61f 100644 --- a/src/amd/vulkan/nir/radv_nir_trim_fs_color_exports.c +++ b/src/amd/vulkan/nir/radv_nir_trim_fs_color_exports.c @@ -6,7 +6,6 @@ #include "nir/nir.h" #include "nir/nir_builder.h" -#include "radv_constants.h" #include "radv_nir.h" #include "radv_shader.h" diff --git a/src/amd/vulkan/radv_acceleration_structure.c b/src/amd/vulkan/radv_acceleration_structure.c index ed131d5bcaf..2a586fecf99 100644 --- a/src/amd/vulkan/radv_acceleration_structure.c +++ b/src/amd/vulkan/radv_acceleration_structure.c @@ -6,7 +6,6 @@ #include "meta/radv_meta.h" #include "radv_buffer.h" -#include "radv_cs.h" #include "radv_entrypoints.h" #include "radix_sort/common/vk/barrier.h" diff --git a/src/amd/vulkan/radv_aco_shader_info.h b/src/amd/vulkan/radv_aco_shader_info.h index 90310c23605..75833464f35 100644 --- a/src/amd/vulkan/radv_aco_shader_info.h +++ b/src/amd/vulkan/radv_aco_shader_info.h @@ -12,7 +12,6 @@ /* this will convert from radv shader info to the ACO one. */ -#include "ac_hw_stage.h" #include "aco_shader_info.h" #define ASSIGN_FIELD(x) aco_info->x = radv->x diff --git a/src/amd/vulkan/radv_android.h b/src/amd/vulkan/radv_android.h index 458c329eac9..7e3b365c960 100644 --- a/src/amd/vulkan/radv_android.h +++ b/src/amd/vulkan/radv_android.h @@ -18,7 +18,7 @@ #include #include -#include "vk_android.h" +#include "util/detect_os.h" /* Helper to determine if we should compile * any of the Android AHB support. diff --git a/src/amd/vulkan/radv_buffer_view.c b/src/amd/vulkan/radv_buffer_view.c index 1361a7388f4..4dabc14f191 100644 --- a/src/amd/vulkan/radv_buffer_view.c +++ b/src/amd/vulkan/radv_buffer_view.c @@ -9,7 +9,6 @@ */ #include "ac_descriptors.h" -#include "gfx10_format_table.h" #include "radv_buffer.h" #include "radv_buffer_view.h" diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 47fa717cf32..7a02c9ab141 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -30,7 +30,6 @@ #include "vk_command_pool.h" #include "vk_enum_defines.h" #include "vk_format.h" -#include "vk_framebuffer.h" #include "vk_render_pass.h" #include "vk_synchronization.h" #include "vk_util.h" @@ -43,7 +42,6 @@ #include "aco_interface.h" -#include "compiler/shader_info.h" #include "util/compiler.h" #include "util/fast_idiv_by_const.h" diff --git a/src/amd/vulkan/radv_cp_reg_shadowing.c b/src/amd/vulkan/radv_cp_reg_shadowing.c index c9de1bef0f1..9ce46ba39e1 100644 --- a/src/amd/vulkan/radv_cp_reg_shadowing.c +++ b/src/amd/vulkan/radv_cp_reg_shadowing.c @@ -9,7 +9,6 @@ #include "ac_shadowed_regs.h" #include "radv_buffer.h" #include "radv_cs.h" -#include "radv_debug.h" #include "sid.h" VkResult diff --git a/src/amd/vulkan/radv_cs.c b/src/amd/vulkan/radv_cs.c index c086820b177..f0e2cd8fe56 100644 --- a/src/amd/vulkan/radv_cs.c +++ b/src/amd/vulkan/radv_cs.c @@ -10,10 +10,8 @@ #include "radv_cs.h" #include "radv_buffer.h" -#include "radv_debug.h" #include "radv_sdma.h" #include "radv_shader.h" -#include "radv_sqtt.h" #include "sid.h" void diff --git a/src/amd/vulkan/radv_cs.h b/src/amd/vulkan/radv_cs.h index 8dc71b13a0c..e17de0fac10 100644 --- a/src/amd/vulkan/radv_cs.h +++ b/src/amd/vulkan/radv_cs.h @@ -10,7 +10,6 @@ #include #include -#include #include "radv_cmd_buffer.h" #include "radv_radeon_winsys.h" diff --git a/src/amd/vulkan/radv_debug.c b/src/amd/vulkan/radv_debug.c index b7e802e7ae9..353bc570666 100644 --- a/src/amd/vulkan/radv_debug.c +++ b/src/amd/vulkan/radv_debug.c @@ -28,7 +28,6 @@ #include "radv_pipeline_graphics.h" #include "radv_pipeline_rt.h" #include "radv_shader.h" -#include "sid.h" #include "vk_common_entrypoints.h" #include "vk_enum_to_str.h" diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 58a999478c2..fa32771abb7 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -11,7 +11,6 @@ #include "radv_descriptors.h" #include "radv_entrypoints.h" #include "radv_sampler.h" -#include "sid.h" #include "vk_descriptors.h" VKAPI_ATTR VkResult VKAPI_CALL diff --git a/src/amd/vulkan/radv_descriptor_set.h b/src/amd/vulkan/radv_descriptor_set.h index a9c8ac67d46..3a42ef824fd 100644 --- a/src/amd/vulkan/radv_descriptor_set.h +++ b/src/amd/vulkan/radv_descriptor_set.h @@ -10,8 +10,6 @@ #include "util/list.h" #include "util/mesa-blake3.h" -#include "radv_constants.h" - #include "vk_descriptor_set_layout.h" #include "vk_object.h" diff --git a/src/amd/vulkan/radv_descriptors.c b/src/amd/vulkan/radv_descriptors.c index 670e1e6a33e..9afd9b90672 100644 --- a/src/amd/vulkan/radv_descriptors.c +++ b/src/amd/vulkan/radv_descriptors.c @@ -8,7 +8,6 @@ #include "radv_descriptors.h" #include "radv_buffer.h" #include "radv_buffer_view.h" -#include "radv_cmd_buffer.h" #include "radv_entrypoints.h" #include "radv_image_view.h" #include "radv_sampler.h" diff --git a/src/amd/vulkan/radv_descriptors.h b/src/amd/vulkan/radv_descriptors.h index 8046cafbc4b..556f1d3689f 100644 --- a/src/amd/vulkan/radv_descriptors.h +++ b/src/amd/vulkan/radv_descriptors.h @@ -7,12 +7,20 @@ #ifndef RADV_DESCRIPTORS_H #define RADV_DESCRIPTORS_H +#include "vk_command_buffer.h" + #include "radv_buffer.h" #include "radv_buffer_view.h" -#include "radv_cmd_buffer.h" #include "radv_constants.h" +#include "radv_descriptor_set.h" +#include "radv_device.h" #include "radv_image_view.h" +#include "radv_physical_device.h" +#include "radv_pipeline.h" +#include "radv_pipeline_layout.h" #include "radv_sampler.h" +#include "radv_shader.h" +#include "radv_video.h" #include diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index c224b05e313..dc06a6b3c50 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -28,7 +28,6 @@ #include "layers/radv_app_workarounds.h" #include "meta/radv_meta.h" -#include "util/disk_cache.h" #include "util/u_debug.h" #include "radv_cs.h" #include "radv_debug.h" @@ -42,32 +41,18 @@ #include "radv_sqtt.h" #include "vk_common_entrypoints.h" #include "vk_pipeline_cache.h" -#include "vk_semaphore.h" #include "vk_util.h" #ifdef _WIN32 typedef void *drmDevicePtr; #include #else #include -#include "drm-uapi/amdgpu_drm.h" -#include "winsys/amdgpu/radv_amdgpu_winsys_public.h" #endif -#include "util/build_id.h" -#include "util/driconf.h" #include "util/mesa-blake3.h" -#include "util/os_time.h" -#include "util/timespec.h" #include "util/u_atomic.h" #include "util/u_process.h" -#include "vulkan/vk_icd.h" #include "git_sha1.h" -#include "sid.h" -#include "vk_format.h" #include "vk_sync.h" -#include "vk_sync_dummy.h" - -#include "ac_descriptors.h" -#include "ac_formats.h" #include "aco_interface.h" diff --git a/src/amd/vulkan/radv_device.h b/src/amd/vulkan/radv_device.h index f90be9aab7d..11ea4ad5f1a 100644 --- a/src/amd/vulkan/radv_device.h +++ b/src/amd/vulkan/radv_device.h @@ -11,11 +11,9 @@ #ifndef RADV_DEVICE_H #define RADV_DEVICE_H -#include "ac_descriptors.h" #include "ac_spm.h" #include "ac_sqtt.h" -#include "util/bitset.h" #include "util/mesa-blake3.h" #include "radv_debug_nir.h" diff --git a/src/amd/vulkan/radv_device_memory.c b/src/amd/vulkan/radv_device_memory.c index 84cff64db67..03e99f4ff3e 100644 --- a/src/amd/vulkan/radv_device_memory.c +++ b/src/amd/vulkan/radv_device_memory.c @@ -11,7 +11,6 @@ #include "radv_device_memory.h" #include "radv_android.h" #include "radv_buffer.h" -#include "radv_debug.h" #include "radv_entrypoints.h" #include "radv_image.h" #include "radv_rmv.h" diff --git a/src/amd/vulkan/radv_dgc.c b/src/amd/vulkan/radv_dgc.c index 8c68493601c..1c743dfd874 100644 --- a/src/amd/vulkan/radv_dgc.c +++ b/src/amd/vulkan/radv_dgc.c @@ -8,9 +8,9 @@ #include "meta/radv_meta.h" #include "nir/radv_meta_nir.h" #include "radv_cs.h" -#include "radv_debug.h" #include "radv_entrypoints.h" #include "radv_pipeline_rt.h" +#include "radv_shader_object.h" #include "ac_rgp.h" diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 65bc847bb8a..69a7376dfd7 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -10,7 +10,6 @@ #include "radv_image.h" #include "util/u_atomic.h" -#include "util/u_debug.h" #include "ac_drm_fourcc.h" #include "ac_formats.h" #include "radv_android.h" @@ -25,15 +24,12 @@ #include "radv_rmv.h" #include "radv_video.h" #include "radv_wsi.h" -#include "sid.h" #include "vk_debug_utils.h" #include "vk_format.h" #include "vk_log.h" #include "vk_render_pass.h" #include "vk_util.h" -#include "gfx10_format_table.h" - static unsigned radv_choose_tiling(struct radv_device *device, const VkImageCreateInfo *pCreateInfo, VkFormat format) { diff --git a/src/amd/vulkan/radv_image.h b/src/amd/vulkan/radv_image.h index 54c6c84e7af..7e2f2fe2ec8 100644 --- a/src/amd/vulkan/radv_image.h +++ b/src/amd/vulkan/radv_image.h @@ -11,6 +11,7 @@ #ifndef RADV_IMAGE_H #define RADV_IMAGE_H +#include "ac_descriptors.h" #include "ac_surface.h" #include "radv_device.h" diff --git a/src/amd/vulkan/radv_image_view.c b/src/amd/vulkan/radv_image_view.c index 34811daf7e5..c404e1adfb3 100644 --- a/src/amd/vulkan/radv_image_view.c +++ b/src/amd/vulkan/radv_image_view.c @@ -19,8 +19,6 @@ #include "radv_image_view.h" #include "ac_descriptors.h" -#include "ac_formats.h" -#include "gfx10_format_table.h" static unsigned radv_tex_dim(VkImageType image_type, VkImageViewType view_type, unsigned nr_layers, unsigned nr_samples, diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c index ba48e6ba548..59cfab9147e 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c @@ -25,7 +25,6 @@ #include "vk_instance.h" #include "vk_log.h" -#include "vk_util.h" static const struct debug_control radv_debug_options[] = { {"nofastclears", RADV_DEBUG_NO_FAST_CLEARS}, diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index 9d8b6d3e39d..208b8845bf4 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -10,18 +10,15 @@ #include "radv_nir_to_llvm.h" #include "nir/nir.h" -#include "radv_debug.h" #include "radv_llvm_helper.h" #include "radv_shader.h" #include "radv_shader_args.h" #include "ac_binary.h" #include "ac_llvm_build.h" -#include "ac_nir.h" #include "ac_nir_to_llvm.h" #include "ac_shader_abi.h" #include "ac_shader_util.h" -#include "sid.h" struct radv_shader_context { struct ac_llvm_context ac; diff --git a/src/amd/vulkan/radv_perfcounter.h b/src/amd/vulkan/radv_perfcounter.h index 04f12628487..08944ead4a5 100644 --- a/src/amd/vulkan/radv_perfcounter.h +++ b/src/amd/vulkan/radv_perfcounter.h @@ -11,8 +11,6 @@ #ifndef RADV_PERFCOUNTER_H #define RADV_PERFCOUNTER_H -#include "radv_radeon_winsys.h" - #include "radv_query.h" struct radv_physical_device; diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index 10521f8b1aa..b0cbeb657a4 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -11,7 +11,6 @@ #include #include "util/os_misc.h" #include "vulkan/vulkan_core.h" -#include "vk_sync_dummy.h" #ifdef MAJOR_IN_SYSMACROS #include @@ -43,7 +42,7 @@ typedef void *drmDevicePtr; #include "git_sha1.h" #if AMD_LLVM_AVAILABLE -#include "ac_llvm_util.h" +#include #endif #ifdef _WIN32 diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 34181a29c40..a9489403561 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -12,28 +12,20 @@ #include "meta/radv_meta.h" #include "nir/nir.h" #include "nir/radv_nir.h" -#include "spirv/nir_spirv.h" -#include "util/disk_cache.h" -#include "util/os_time.h" #include "util/u_atomic.h" -#include "radv_cs.h" #include "radv_debug.h" -#include "radv_descriptors.h" #include "radv_pipeline_rt.h" #include "radv_rmv.h" #include "radv_shader.h" #include "radv_shader_args.h" #include "vk_pipeline.h" -#include "vk_render_pass.h" #include "vk_util.h" -#include "util/u_debug.h" #include "ac_binary.h" #include "ac_nir.h" #include "ac_shader_util.h" #include "aco_interface.h" -#include "sid.h" -#include "vk_format.h" +#include "vk_shader_module.h" bool radv_pipeline_capture_shaders(const struct radv_compiler_info *compiler_info, VkPipelineCreateFlags2 flags) diff --git a/src/amd/vulkan/radv_pipeline.h b/src/amd/vulkan/radv_pipeline.h index ae5a7b01561..9fccf79a8a0 100644 --- a/src/amd/vulkan/radv_pipeline.h +++ b/src/amd/vulkan/radv_pipeline.h @@ -16,8 +16,6 @@ #include "vk_pipeline.h" #include "vk_pipeline_cache.h" -#include "radv_radeon_winsys.h" - struct radv_device; struct radv_shader_stage_key; struct radv_shader_stage; diff --git a/src/amd/vulkan/radv_pipeline_binary.c b/src/amd/vulkan/radv_pipeline_binary.c index 42d58b7a729..69f2dde9486 100644 --- a/src/amd/vulkan/radv_pipeline_binary.c +++ b/src/amd/vulkan/radv_pipeline_binary.c @@ -6,13 +6,12 @@ #include "radv_pipeline_binary.h" #include "util/blob.h" -#include "util/disk_cache.h" #include "util/macros.h" #include "util/mesa-blake3.h" #include "util/mesa-blake3.h" #include "util/u_atomic.h" -#include "util/u_debug.h" -#include "radv_debug.h" +#include "radv_device.h" +#include "radv_physical_device.h" #include "radv_device.h" #include "radv_entrypoints.h" #include "radv_pipeline_cache.h" @@ -21,7 +20,6 @@ #include "radv_shader.h" #include "vk_log.h" #include "vk_pipeline.h" -#include "vk_util.h" static VkResult radv_get_pipeline_key(struct radv_device *device, const VkPipelineCreateInfoKHR *pPipelineCreateInfo, diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index ebf67a119b0..3dd828a0465 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -5,12 +5,10 @@ */ #include "radv_pipeline_cache.h" -#include "util/disk_cache.h" #include "util/macros.h" #include "util/mesa-blake3.h" #include "util/mesa-blake3.h" #include "util/u_atomic.h" -#include "util/u_debug.h" #include "nir.h" #include "nir_serialize.h" #include "radv_debug.h" @@ -22,7 +20,6 @@ #include "radv_pipeline_rt.h" #include "radv_shader.h" #include "vk_pipeline.h" -#include "vk_util.h" #include "aco_interface.h" diff --git a/src/amd/vulkan/radv_pipeline_compute.c b/src/amd/vulkan/radv_pipeline_compute.c index d1b67a0c3e1..59d2ea3fe8d 100644 --- a/src/amd/vulkan/radv_pipeline_compute.c +++ b/src/amd/vulkan/radv_pipeline_compute.c @@ -10,33 +10,22 @@ #include "meta/radv_meta.h" #include "nir/nir.h" -#include "nir/nir_builder.h" -#include "nir/nir_serialize.h" #include "nir/radv_nir.h" -#include "spirv/nir_spirv.h" -#include "util/disk_cache.h" #include "util/mesa-blake3.h" #include "util/os_time.h" #include "util/u_atomic.h" -#include "radv_cs.h" #include "radv_debug.h" #include "radv_pipeline_binary.h" #include "radv_pipeline_cache.h" #include "radv_rmv.h" #include "radv_shader.h" #include "radv_shader_args.h" -#include "vk_nir_convert_ycbcr.h" #include "vk_pipeline.h" -#include "vk_render_pass.h" #include "vk_util.h" -#include "util/u_debug.h" #include "ac_binary.h" -#include "ac_nir.h" -#include "ac_shader_util.h" #include "aco_interface.h" #include "sid.h" -#include "vk_format.h" uint32_t radv_get_compute_resource_limits(const struct radv_physical_device *pdev, const struct radv_shader_info *info) diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index 54ec910224d..b7d80ede12f 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/src/amd/vulkan/radv_pipeline_graphics.c @@ -10,16 +10,12 @@ #include "meta/radv_meta.h" #include "nir/nir.h" -#include "nir/nir_builder.h" #include "nir/nir_serialize.h" #include "nir/nir_xfb_info.h" #include "nir/radv_nir.h" -#include "spirv/nir_spirv.h" -#include "util/disk_cache.h" #include "util/mesa-blake3.h" #include "util/os_time.h" #include "util/u_atomic.h" -#include "radv_cs.h" #include "radv_debug.h" #include "radv_entrypoints.h" #include "radv_formats.h" @@ -30,18 +26,14 @@ #include "radv_shader.h" #include "radv_shader_args.h" #include "shader_enums.h" -#include "vk_nir_convert_ycbcr.h" #include "vk_pipeline.h" -#include "vk_render_pass.h" #include "vk_util.h" -#include "util/u_debug.h" #include "ac_binary.h" #include "ac_formats.h" #include "ac_nir.h" #include "ac_shader_util.h" #include "aco_interface.h" -#include "sid.h" static bool radv_is_static_vrs_enabled(const struct vk_graphics_pipeline_state *state) diff --git a/src/amd/vulkan/radv_pipeline_graphics.h b/src/amd/vulkan/radv_pipeline_graphics.h index 7979ea78495..6cb773816cb 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.h +++ b/src/amd/vulkan/radv_pipeline_graphics.h @@ -11,7 +11,7 @@ #ifndef RADV_PIPELINE_GRAPHICS_H #define RADV_PIPELINE_GRAPHICS_H -#include "sid.h" +#include "amdgfxregs.h" #include "radv_descriptor_set.h" #include "radv_pipeline.h" @@ -19,7 +19,6 @@ #include "radv_shader.h" #include "vk_graphics_state.h" -#include "vk_meta.h" #define VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO_RADV (VkStructureType)2000290001 diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index 613e1184762..d58c05373ce 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/src/amd/vulkan/radv_pipeline_rt.c @@ -9,7 +9,6 @@ #include "nir/nir_serialize.h" #include "ac_shader_util.h" -#include "vk_shader_module.h" #include "nir/radv_nir.h" #include "nir/radv_nir_rt_stage_cps.h" @@ -27,8 +26,6 @@ #include "nir/radv_nir_rt_stage_common.h" #include "aco_interface.h" -#include "aco_nir_call_attribs.h" -#include "radv_aco_shader_info.h" #include "radv_rmv.h" #include "radv_shader.h" diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_radeon_winsys.h index ed0e6648a1b..a393de18391 100644 --- a/src/amd/vulkan/radv_radeon_winsys.h +++ b/src/amd/vulkan/radv_radeon_winsys.h @@ -17,8 +17,6 @@ #include #include #include -#include "util/u_math.h" -#include "util/u_memory.h" #include #include "ac_cmdbuf.h" #include "amd_family.h" diff --git a/src/amd/vulkan/radv_rmv.h b/src/amd/vulkan/radv_rmv.h index 47f48dcd9d5..f24c73970e4 100644 --- a/src/amd/vulkan/radv_rmv.h +++ b/src/amd/vulkan/radv_rmv.h @@ -12,8 +12,6 @@ #define RADV_RMV_H #include "rmv/vk_rmv_common.h" -#include "rmv/vk_rmv_tokens.h" - #include "radv_radeon_winsys.h" struct radv_device; diff --git a/src/amd/vulkan/radv_sdma.c b/src/amd/vulkan/radv_sdma.c index d05d73e1ef4..5a9241b4acb 100644 --- a/src/amd/vulkan/radv_sdma.c +++ b/src/amd/vulkan/radv_sdma.c @@ -10,12 +10,10 @@ #include "radv_sdma.h" #include "meta/radv_meta.h" #include "util/macros.h" -#include "util/u_memory.h" #include "radv_cs.h" #include "radv_formats.h" #include "ac_cmdbuf_sdma.h" -#include "ac_formats.h" struct radv_sdma_chunked_copy_info { unsigned extent_horizontal_blocks; diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 533120f9b12..64a80f0a80f 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -29,7 +29,6 @@ #include "radv_sdma.h" #include "radv_shader_args.h" -#include "util/u_debug.h" #include "ac_binary.h" #include "ac_nir.h" #if defined(USE_LIBELF) @@ -38,7 +37,6 @@ #include "aco_interface.h" #include "sid.h" #include "vk_debug_report.h" -#include "vk_format.h" #include "vk_nir.h" #include "vk_nir_lower_descriptor_heaps.h" #include "vk_sampler.h" diff --git a/src/amd/vulkan/radv_shader_args.h b/src/amd/vulkan/radv_shader_args.h index ed8669e76f2..5d85e9e454f 100644 --- a/src/amd/vulkan/radv_shader_args.h +++ b/src/amd/vulkan/radv_shader_args.h @@ -8,7 +8,6 @@ #define RADV_SHADER_ARGS_H #include "compiler/shader_enums.h" -#include "util/list.h" #include "util/macros.h" #include "ac_shader_args.h" #include "amd_family.h" diff --git a/src/amd/vulkan/radv_shader_info.h b/src/amd/vulkan/radv_shader_info.h index b2950b54891..8d9945a6aea 100644 --- a/src/amd/vulkan/radv_shader_info.h +++ b/src/amd/vulkan/radv_shader_info.h @@ -14,7 +14,6 @@ #include #include -#include "util/set.h" #include "ac_nir.h" #include "radv_constants.h" #include "radv_shader_args.h" diff --git a/src/amd/vulkan/radv_spm.c b/src/amd/vulkan/radv_spm.c index c0205cbe3e7..88a9f143fbc 100644 --- a/src/amd/vulkan/radv_spm.c +++ b/src/amd/vulkan/radv_spm.c @@ -14,8 +14,6 @@ #include "vk_common_entrypoints.h" -#include "sid.h" - static bool radv_spm_init_bo(struct radv_device *device) { diff --git a/src/amd/vulkan/radv_spm.h b/src/amd/vulkan/radv_spm.h index 2d0a1f1a086..b95957ed878 100644 --- a/src/amd/vulkan/radv_spm.h +++ b/src/amd/vulkan/radv_spm.h @@ -13,7 +13,6 @@ #include "radv_device.h" #include "radv_queue.h" -#include "radv_radeon_winsys.h" void radv_emit_spm_setup(struct radv_device *device, struct radv_cmd_stream *cs); diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c index 4d30180cdad..49658b23475 100644 --- a/src/amd/vulkan/radv_sqtt.c +++ b/src/amd/vulkan/radv_sqtt.c @@ -8,12 +8,10 @@ #include "radv_buffer.h" #include "radv_cs.h" -#include "radv_debug.h" #include "radv_entrypoints.h" #include "radv_perfcounter.h" #include "radv_spm.h" #include "radv_sqtt.h" -#include "sid.h" #include "ac_pm4.h" #include "ac_rgp.h" diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index 4bce487f659..a6cecae3d20 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/src/amd/vulkan/radv_wsi.c @@ -7,12 +7,18 @@ */ #include "radv_wsi.h" -#include "meta/radv_meta.h" -#include "util/macros.h" +#include "radv_buffer.h" +#include "radv_buffer_view.h" +#include "radv_device.h" +#include "radv_device_memory.h" +#include "radv_entrypoints.h" +#include "radv_physical_device.h" +#include "radv_pipeline.h" +#include "radv_pipeline_compute.h" +#include "radv_queue.h" +#include "radv_shader.h" + #include "radv_debug.h" -#include "vk_fence.h" -#include "vk_semaphore.h" -#include "vk_util.h" #include "wsi_common.h" static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c index 0acb18e639a..c01ddea854c 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c @@ -23,7 +23,6 @@ #include "radv_debug.h" #include "radv_radeon_winsys.h" #include "sid.h" -#include "vk_alloc.h" #include "vk_drm_syncobj.h" #include "vk_sync.h" #include "vk_sync_dummy.h" diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h index 4adf18af05d..77f8e02ac44 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h @@ -14,7 +14,6 @@ #include #include -#include #include "radv_amdgpu_winsys.h" #include "radv_radeon_winsys.h" diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c index 438b4341220..3bdc4c914e8 100644 --- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c +++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.c @@ -11,7 +11,6 @@ #include #include #include -#include #include "drm-uapi/amdgpu_drm.h" #include "ac_linux_drm.h" #include "ac_surface.h" @@ -20,7 +19,7 @@ #include "radv_amdgpu_winsys_public.h" #include "radv_debug.h" #include "vk_drm_syncobj.h" -#include "xf86drm.h" +#include "util/u_memory.h" static void radv_amdgpu_winsys_query_info(struct radeon_winsys *rws, struct radeon_info *gpu_info) diff --git a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c index 78ba680a1a7..79538ff7e86 100644 --- a/src/gallium/drivers/radeonsi/radeon_uvd_enc.c +++ b/src/gallium/drivers/radeonsi/radeon_uvd_enc.c @@ -12,7 +12,6 @@ #include "radeon_bitstream.h" #include "si_pipe.h" #include "util/u_memory.h" -#include "util/u_video.h" #include "vl/vl_video_buffer.h" #include diff --git a/src/gallium/drivers/radeonsi/radeon_vce.c b/src/gallium/drivers/radeonsi/radeon_vce.c index 23d96e605a2..d9335101165 100644 --- a/src/gallium/drivers/radeonsi/radeon_vce.c +++ b/src/gallium/drivers/radeonsi/radeon_vce.c @@ -12,8 +12,8 @@ #include "radeon_bitstream.h" #include "si_pipe.h" #include "util/u_memory.h" -#include "util/u_video.h" #include "vl/vl_video_buffer.h" +#include "si_video.h" #include diff --git a/src/gallium/drivers/radeonsi/radeon_vce.h b/src/gallium/drivers/radeonsi/radeon_vce.h index 09065f87800..47f3b0dfa44 100644 --- a/src/gallium/drivers/radeonsi/radeon_vce.h +++ b/src/gallium/drivers/radeonsi/radeon_vce.h @@ -9,8 +9,8 @@ #ifndef RADEON_VCE_H #define RADEON_VCE_H -#include "si_video.h" -#include "util/list.h" +#include "si_pipe.h" +#include "pipe/p_video_codec.h" #define RVCE_CS(value) (enc->cs.current.buf[enc->cs.current.cdw++] = (value)) #define RVCE_BEGIN(cmd) \ diff --git a/src/gallium/drivers/radeonsi/radeon_vcn.c b/src/gallium/drivers/radeonsi/radeon_vcn.c index 5b4bcfd9824..bfb8def1bdb 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn.c @@ -5,6 +5,7 @@ */ #include "radeon_vcn.h" +#include "winsys/radeon_winsys.h" /* vcn unified queue (sq) ib header */ void rvcn_sq_header(struct radeon_cmdbuf *cs, diff --git a/src/gallium/drivers/radeonsi/radeon_vcn.h b/src/gallium/drivers/radeonsi/radeon_vcn.h index b0d32f1c83b..dab0b2fbb42 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn.h +++ b/src/gallium/drivers/radeonsi/radeon_vcn.h @@ -7,10 +7,11 @@ #ifndef RADEON_VCN_H #define RADEON_VCN_H -#include "si_video.h" - +#include #include "ac_vcn.h" +struct radeon_cmdbuf; + void rvcn_sq_header(struct radeon_cmdbuf *cs, struct rvcn_sq_var *sq, bool enc); diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc.h b/src/gallium/drivers/radeonsi/radeon_vcn_enc.h index 48e7b63f038..d1b8a65fdcb 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc.h +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc.h @@ -9,8 +9,7 @@ #ifndef _RADEON_VCN_ENC_H #define _RADEON_VCN_ENC_H -#include "radeon_vcn.h" -#include "util/macros.h" +#include "ac_vcn.h" #include "radeon_bitstream.h" #include "pipe/p_video_codec.h" diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c index 801e6f3a1e6..555317f2b1c 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_1_2.c @@ -8,12 +8,9 @@ #include "pipe/p_video_codec.h" #include "radeon_vcn_enc.h" -#include "si_video.h" #include "si_pipe.h" #include "util/u_video.h" -#include - #define RENCODE_FW_INTERFACE_MAJOR_VERSION 1 #define RENCODE_FW_INTERFACE_MINOR_VERSION 9 diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_2_0.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_2_0.c index 5b5b25d65ee..63675ad04db 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_2_0.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_2_0.c @@ -8,12 +8,9 @@ #include "pipe/p_video_codec.h" #include "radeon_vcn_enc.h" -#include "si_video.h" #include "si_pipe.h" #include "util/u_video.h" -#include - #define RENCODE_FW_INTERFACE_MAJOR_VERSION 1 #define RENCODE_FW_INTERFACE_MINOR_VERSION 20 diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c index a4b2703949e..cd4da4a6a7c 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_3_0.c @@ -6,14 +6,11 @@ * **************************************************************************/ -#include - #include "pipe/p_video_codec.h" #include "util/u_video.h" #include "si_pipe.h" -#include "si_video.h" #include "radeon_vcn_enc.h" #define RENCODE_FW_INTERFACE_MAJOR_VERSION 1 diff --git a/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c b/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c index e1a3c188bfa..757d150d747 100644 --- a/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c +++ b/src/gallium/drivers/radeonsi/radeon_vcn_enc_4_0.c @@ -12,6 +12,7 @@ #include "si_pipe.h" #include "radeon_vcn_enc.h" +#include "radeon_vcn.h" #define RENCODE_FW_INTERFACE_MAJOR_VERSION 1 #define RENCODE_FW_INTERFACE_MINOR_VERSION 15 diff --git a/src/gallium/drivers/radeonsi/si_build_pm4.h b/src/gallium/drivers/radeonsi/si_build_pm4.h index 35d0cf28c06..cea97afee1a 100644 --- a/src/gallium/drivers/radeonsi/si_build_pm4.h +++ b/src/gallium/drivers/radeonsi/si_build_pm4.h @@ -11,10 +11,7 @@ #ifndef SI_BUILD_PM4_H #define SI_BUILD_PM4_H -#include "ac_cmdbuf_cp.h" - #include "si_pipe.h" -#include "sid.h" #define radeon_begin(cs) struct radeon_cmdbuf *__rcs = (cs); \ ac_cmdbuf_begin(&__rcs->current) diff --git a/src/gallium/drivers/radeonsi/si_clear.c b/src/gallium/drivers/radeonsi/si_clear.c index 3bd5abeec8f..70acbf4ca71 100644 --- a/src/gallium/drivers/radeonsi/si_clear.c +++ b/src/gallium/drivers/radeonsi/si_clear.c @@ -5,7 +5,6 @@ */ #include "si_pipe.h" -#include "sid.h" #include "util/format/u_format.h" #include "util/u_pack_color.h" #include "util/u_surface.h" diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index d03e9bcbb6f..dc1ef965f64 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -9,7 +9,6 @@ #include "ac_shader_util.h" #include "si_build_pm4.h" #include "si_shader_internal.h" -#include "util/u_async_debug.h" #include "util/u_memory.h" #include "util/u_upload_mgr.h" #include "si_tracepoints.h" diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c b/src/gallium/drivers/radeonsi/si_compute_blit.c index f0e0f7b73e5..404c471cb3e 100644 --- a/src/gallium/drivers/radeonsi/si_compute_blit.c +++ b/src/gallium/drivers/radeonsi/si_compute_blit.c @@ -8,7 +8,6 @@ #include "util/format/u_format.h" #include "util/format_srgb.h" #include "util/hash_table.h" -#include "util/u_pack_color.h" #include "ac_nir_meta.h" static void si_compute_begin_internal(struct si_context *sctx, bool render_condition_enabled) diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index c31eaee2e04..b2808d13e9e 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -7,6 +7,7 @@ #include "si_pipe.h" #include "sid.h" #include "si_build_pm4.h" +#include "ac_cmdbuf_cp.h" /* Set this if you want the ME to wait until CP DMA is done. * It should be set on the last CP DMA packet. */ diff --git a/src/gallium/drivers/radeonsi/si_cp_reg_shadowing.c b/src/gallium/drivers/radeonsi/si_cp_reg_shadowing.c index b62b8803100..4a5638fa7fc 100644 --- a/src/gallium/drivers/radeonsi/si_cp_reg_shadowing.c +++ b/src/gallium/drivers/radeonsi/si_cp_reg_shadowing.c @@ -4,10 +4,8 @@ * SPDX-License-Identifier: MIT */ -#include "si_build_pm4.h" -#include "ac_debug.h" +#include "si_pipe.h" #include "ac_shadowed_regs.h" -#include "util/u_memory.h" bool si_init_cp_reg_shadowing(struct si_context *sctx) { diff --git a/src/gallium/drivers/radeonsi/si_cp_utils.c b/src/gallium/drivers/radeonsi/si_cp_utils.c index 419925b8ec5..3efc4d6ac5b 100644 --- a/src/gallium/drivers/radeonsi/si_cp_utils.c +++ b/src/gallium/drivers/radeonsi/si_cp_utils.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: MIT */ -#include "si_build_pm4.h" +#include "si_pipe.h" +#include "ac_cmdbuf_cp.h" void si_cp_release_mem_pws(struct si_context *sctx, struct radeon_cmdbuf *cs, unsigned event_type, unsigned gcr_cntl) diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index 20cadcd0b5a..a4fa0b03271 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -5,17 +5,12 @@ */ #include "ac_debug.h" -#include "ac_rtld.h" #include "driver_ddebug/dd_util.h" #include "si_pipe.h" -#include "sid.h" -#include "sid_tables.h" -#include "tgsi/tgsi_from_mesa.h" #include "util/u_dump.h" #include "util/u_log.h" #include "util/u_memory.h" #include "util/u_process.h" -#include "util/u_string.h" static void si_dump_bo_list(struct si_context *sctx, const struct radeon_saved_cs *saved, FILE *f); diff --git a/src/gallium/drivers/radeonsi/si_debug_gfx_compute.c b/src/gallium/drivers/radeonsi/si_debug_gfx_compute.c index 58dba841a8f..fe4dc91a946 100644 --- a/src/gallium/drivers/radeonsi/si_debug_gfx_compute.c +++ b/src/gallium/drivers/radeonsi/si_debug_gfx_compute.c @@ -6,16 +6,9 @@ #include "ac_debug.h" #include "ac_rtld.h" -#include "driver_ddebug/dd_util.h" #include "si_pipe.h" -#include "sid.h" -#include "sid_tables.h" -#include "tgsi/tgsi_from_mesa.h" -#include "util/u_dump.h" #include "util/u_log.h" #include "util/u_memory.h" -#include "util/u_process.h" -#include "util/u_string.h" DEBUG_GET_ONCE_OPTION(replace_shaders, "RADEON_REPLACE_SHADERS", NULL) diff --git a/src/gallium/drivers/radeonsi/si_fence.c b/src/gallium/drivers/radeonsi/si_fence.c index cd00dbf3e24..24f833d31a0 100644 --- a/src/gallium/drivers/radeonsi/si_fence.c +++ b/src/gallium/drivers/radeonsi/si_fence.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: MIT */ -#include "si_build_pm4.h" +#include "si_pipe.h" +#include "ac_cmdbuf_cp.h" #include "util/os_time.h" #include "util/u_memory.h" #include "util/u_queue.h" diff --git a/src/gallium/drivers/radeonsi/si_gfx_cs.c b/src/gallium/drivers/radeonsi/si_gfx_cs.c index baa22967e3f..046c5c6659c 100644 --- a/src/gallium/drivers/radeonsi/si_gfx_cs.c +++ b/src/gallium/drivers/radeonsi/si_gfx_cs.c @@ -11,6 +11,7 @@ #include "util/os_time.h" #include "util/u_log.h" #include "util/u_upload_mgr.h" +#include "ac_cmdbuf_cp.h" #include "ac_debug.h" #include "si_utrace.h" diff --git a/src/gallium/drivers/radeonsi/si_mesh_shader.c b/src/gallium/drivers/radeonsi/si_mesh_shader.c index 360ebb46e08..24d9b5fc417 100644 --- a/src/gallium/drivers/radeonsi/si_mesh_shader.c +++ b/src/gallium/drivers/radeonsi/si_mesh_shader.c @@ -6,9 +6,7 @@ #include "si_pipe.h" #include "si_build_pm4.h" -#include "si_shader_internal.h" #include "si_query.h" -#include "nir.h" #include "util/u_upload_mgr.h" #define SI_MESH_PIPELINE_STATE_DIRTY_MASK \ diff --git a/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c b/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c index 546314a7c7d..5760a7505a5 100644 --- a/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c +++ b/src/gallium/drivers/radeonsi/si_nir_kill_outputs.c @@ -3,7 +3,7 @@ */ #include "si_shader_internal.h" -#include "nir_builder.h" +#include "nir.h" bool si_nir_kill_outputs(nir_shader *nir, const union si_shader_key *key) { diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_resource.c b/src/gallium/drivers/radeonsi/si_nir_lower_resource.c index a1b98f0beba..e329edc4165 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_resource.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_resource.c @@ -18,7 +18,6 @@ #include "ac_nir.h" #include "si_pipe.h" #include "si_shader_internal.h" -#include "sid.h" struct lower_resource_state { struct si_shader *shader; diff --git a/src/gallium/drivers/radeonsi/si_perfcounter.c b/src/gallium/drivers/radeonsi/si_perfcounter.c index bbe2c1698f5..4cc658bfa2e 100644 --- a/src/gallium/drivers/radeonsi/si_perfcounter.c +++ b/src/gallium/drivers/radeonsi/si_perfcounter.c @@ -8,6 +8,7 @@ #include "si_query.h" #include "util/u_memory.h" +#include "ac_cmdbuf_cp.h" #include "ac_perfcounter.h" struct si_query_group { diff --git a/src/gallium/drivers/radeonsi/si_perfetto.h b/src/gallium/drivers/radeonsi/si_perfetto.h index 1897064bae1..b4b528ab4eb 100644 --- a/src/gallium/drivers/radeonsi/si_perfetto.h +++ b/src/gallium/drivers/radeonsi/si_perfetto.h @@ -9,10 +9,7 @@ #include -#include "util/macros.h" #include "util/perf/u_trace.h" -#include "util/u_vector.h" - #include "amd/common/ac_gpu_info.h" #ifdef __cplusplus diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index da9918ef4cf..d0fed896dfc 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -14,7 +14,6 @@ #include "ac_shadowed_regs.h" #include "compiler/nir/nir.h" #include "util/disk_cache.h" -#include "util/helpers.h" #include "util/hex.h" #include "util/u_cpu_detect.h" #include "util/u_memory.h" diff --git a/src/gallium/drivers/radeonsi/si_pm4.c b/src/gallium/drivers/radeonsi/si_pm4.c index a76668ee6e1..5ea3ce508e9 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.c +++ b/src/gallium/drivers/radeonsi/si_pm4.c @@ -7,9 +7,7 @@ #include "si_pm4.h" #include "si_pipe.h" #include "si_build_pm4.h" -#include "sid.h" #include "util/u_memory.h" -#include "ac_debug.h" void si_pm4_clear_state(struct si_pm4_state *state, struct si_screen *sscreen, bool is_compute_queue) diff --git a/src/gallium/drivers/radeonsi/si_pm4.h b/src/gallium/drivers/radeonsi/si_pm4.h index 8828bdef865..cf410dbda58 100644 --- a/src/gallium/drivers/radeonsi/si_pm4.h +++ b/src/gallium/drivers/radeonsi/si_pm4.h @@ -7,7 +7,6 @@ #ifndef SI_PM4_H #define SI_PM4_H -#include #include #include "ac_pm4.h" diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c index 66115482779..428ff5c1a8d 100644 --- a/src/gallium/drivers/radeonsi/si_query.c +++ b/src/gallium/drivers/radeonsi/si_query.c @@ -11,6 +11,7 @@ #include "amd/common/sid.h" #include "si_pipe.h" +#include "ac_cmdbuf_cp.h" #include "util/os_time.h" #include "util/u_memory.h" #include "util/u_suballoc.h" diff --git a/src/gallium/drivers/radeonsi/si_sdma_copy_image.c b/src/gallium/drivers/radeonsi/si_sdma_copy_image.c index 697f285208f..3207207872b 100644 --- a/src/gallium/drivers/radeonsi/si_sdma_copy_image.c +++ b/src/gallium/drivers/radeonsi/si_sdma_copy_image.c @@ -5,10 +5,8 @@ * SPDX-License-Identifier: MIT */ -#include "si_build_pm4.h" -#include "sid.h" +#include "si_pipe.h" #include "util/u_memory.h" -#include "ac_formats.h" #include "ac_cmdbuf_sdma.h" static diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index dce68368e4a..85e7dfa49a2 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -7,7 +7,7 @@ #include "ac_nir.h" #include "ac_rtld.h" #include "ac_shader_util.h" -#include "nir_builder.h" +#include "nir.h" #include "nir_serialize.h" #include "nir_tcs_info.h" #include "nir_xfb_info.h" diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index f4d48622954..d1ce5850466 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -113,7 +113,6 @@ #include "shader_info.h" #include "ac_binary.h" -#include "ac_gpu_info.h" #include "util/mesa-blake3.h" #include "util/u_live_shader_cache.h" #include "util/u_queue.h" diff --git a/src/gallium/drivers/radeonsi/si_shader_info.c b/src/gallium/drivers/radeonsi/si_shader_info.c index d552cf52b05..3e6a5bffa91 100644 --- a/src/gallium/drivers/radeonsi/si_shader_info.c +++ b/src/gallium/drivers/radeonsi/si_shader_info.c @@ -8,7 +8,6 @@ #include "si_shader_internal.h" #include "util/mesa-blake3.h" #include "pipe/p_shader_tokens.h" -#include "sid.h" #include "nir.h" #include "nir_tcs_info.h" #include "nir_xfb_info.h" diff --git a/src/gallium/drivers/radeonsi/si_shader_info.h b/src/gallium/drivers/radeonsi/si_shader_info.h index 60520b0272e..a6743228131 100644 --- a/src/gallium/drivers/radeonsi/si_shader_info.h +++ b/src/gallium/drivers/radeonsi/si_shader_info.h @@ -6,6 +6,7 @@ #define SI_SHADER_INFO_H #include "ac_nir.h" +#include "shader_info.h" #define SI_NUM_INTERP 32 diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm.c b/src/gallium/drivers/radeonsi/si_shader_llvm.c index 2e38b3813c9..230f704cb1c 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm.c @@ -12,9 +12,6 @@ #include "si_pipe.h" #include "si_shader_internal.h" #include "si_shader_llvm.h" -#include "sid.h" -#include "util/u_memory.h" -#include "util/u_prim.h" struct si_llvm_diagnostics { struct util_debug_callback *debug; diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c b/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c index c4abdd78ed3..72917609bca 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm_gs.c @@ -4,13 +4,10 @@ * SPDX-License-Identifier: MIT */ -#include "ac_nir.h" #include "si_pipe.h" #include "si_shader_internal.h" #include "si_shader_llvm.h" #include "si_query.h" -#include "sid.h" -#include "util/u_memory.h" LLVMValueRef si_is_es_thread(struct si_shader_context *ctx) { diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c b/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c index 4e2054ebd3a..3d4625fda7a 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm_ps.c @@ -7,7 +7,6 @@ #include "si_pipe.h" #include "si_shader_internal.h" #include "si_shader_llvm.h" -#include "sid.h" #include "nir.h" static LLVMValueRef si_build_fs_interp(struct si_shader_context *ctx, unsigned attr_index, diff --git a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c b/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c index a413bf0df09..112cfac5a89 100644 --- a/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c +++ b/src/gallium/drivers/radeonsi/si_shader_llvm_tess.c @@ -7,7 +7,6 @@ #include "si_pipe.h" #include "si_shader_internal.h" #include "si_shader_llvm.h" -#include "sid.h" #include "nir.h" static LLVMValueRef si_nir_load_tcs_varyings(struct ac_shader_abi *abi, unsigned num_components, diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index 9a4c394167a..6a0f03685ed 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -4,10 +4,8 @@ * SPDX-License-Identifier: MIT */ -#include "nir_builder.h" -#include "nir_xfb_info.h" +#include "nir.h" #include "si_pipe.h" -#include "ac_nir.h" #include "si_shader_internal.h" void si_nir_opts(struct si_screen *sscreen, struct nir_shader *nir, bool has_array_temps) diff --git a/src/gallium/drivers/radeonsi/si_shader_variant_info.c b/src/gallium/drivers/radeonsi/si_shader_variant_info.c index f2ab5e9f674..ffb3396d103 100644 --- a/src/gallium/drivers/radeonsi/si_shader_variant_info.c +++ b/src/gallium/drivers/radeonsi/si_shader_variant_info.c @@ -5,7 +5,6 @@ #include "si_shader_internal.h" #include "nir.h" #include "nir_range_analysis.h" -#include "sid.h" #include "si_pipe.h" /* The spi_shader_*_format fields depend on the framebuffer state and the diff --git a/src/gallium/drivers/radeonsi/si_shaderlib_nir.c b/src/gallium/drivers/radeonsi/si_shaderlib_nir.c index 2cbaf4a05b1..b9cc6ec65f4 100644 --- a/src/gallium/drivers/radeonsi/si_shaderlib_nir.c +++ b/src/gallium/drivers/radeonsi/si_shaderlib_nir.c @@ -10,7 +10,7 @@ #include "si_pipe.h" #include "si_query.h" #include "aco_interface.h" -#include "nir_format_convert.h" +#include "nir_builder.h" #include "ac_nir_helpers.h" #include "nir/nir_serialize.h" diff --git a/src/gallium/drivers/radeonsi/si_sqtt.c b/src/gallium/drivers/radeonsi/si_sqtt.c index a107f3d9b7d..020a97e448a 100644 --- a/src/gallium/drivers/radeonsi/si_sqtt.c +++ b/src/gallium/drivers/radeonsi/si_sqtt.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: MIT */ +#include "ac_cmdbuf_cp.h" #include "ac_shader_util.h" #include "amd_family.h" #include "si_build_pm4.h" #include "si_pipe.h" -#include "tgsi/tgsi_from_mesa.h" #include "util/hash_table.h" #include "util/u_debug.h" #include "util/u_memory.h" diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index a8bda2a21f4..4556063d578 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -10,12 +10,10 @@ #include "sid.h" #include "util/fast_idiv_by_const.h" #include "util/format/u_format.h" -#include "util/format/u_format_s3tc.h" #include "util/hash_table.h" #include "util/u_dual_blend.h" #include "util/u_helpers.h" #include "util/u_memory.h" -#include "util/u_resource.h" #include "util/u_upload_mgr.h" #include "util/u_blend.h" #include "util/u_process.h" diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h index e0fc6786657..cb65a533864 100644 --- a/src/gallium/drivers/radeonsi/si_state.h +++ b/src/gallium/drivers/radeonsi/si_state.h @@ -9,9 +9,6 @@ #include "si_pm4.h" #include "util/format/u_format.h" -#include "util/bitset.h" - -#include "common/ac_cmdbuf.h" #ifdef __cplusplus extern "C" { diff --git a/src/gallium/drivers/radeonsi/si_state_binning.c b/src/gallium/drivers/radeonsi/si_state_binning.c index b6f8a6c7a0e..b51ce93b1af 100644 --- a/src/gallium/drivers/radeonsi/si_state_binning.c +++ b/src/gallium/drivers/radeonsi/si_state_binning.c @@ -7,7 +7,6 @@ /* This file handles register programming of primitive binning. */ #include "si_build_pm4.h" -#include "sid.h" struct uvec2 { unsigned x, y; diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp index 52d2b47af9a..f6eff1da66c 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.cpp +++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp @@ -5,13 +5,13 @@ */ #include "si_build_pm4.h" +#include "ac_cmdbuf_cp.h" #include "util/hash_table.h" #define XXH_INLINE_ALL #include "util/xxhash.h" #include "util/u_cpu_detect.h" #include "util/u_index_modify.h" -#include "util/u_prim.h" #include "util/u_upload_mgr.h" #include "ac_rtld.h" #include "si_build_pm4.h" diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.cpp b/src/gallium/drivers/radeonsi/si_state_shaders.cpp index 2d33138e66d..6ecf77d1e5a 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.cpp +++ b/src/gallium/drivers/radeonsi/si_state_shaders.cpp @@ -4,6 +4,7 @@ * SPDX-License-Identifier: MIT */ +#include "ac_cmdbuf_cp.h" #include "ac_nir.h" #include "ac_shader_util.h" #include "nir.h" @@ -19,8 +20,6 @@ #include "util/u_async_debug.h" #include "util/u_math.h" #include "util/u_memory.h" -#include "util/u_prim.h" -#include "tgsi/tgsi_from_mesa.h" static void si_update_tess_in_out_patch_vertices(struct si_context *sctx); diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index 52007579515..2e764e4b593 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -8,21 +8,15 @@ #include "drm-uapi/drm_fourcc.h" #include "si_pipe.h" #include "si_query.h" -#include "sid.h" #include "frontend/drm_driver.h" #include "util/format/u_format.h" -#include "util/os_time.h" #include "util/u_log.h" #include "util/u_memory.h" -#include "util/u_pack_color.h" #include "util/u_resource.h" -#include "util/u_surface.h" #include "util/u_transfer.h" -#include #include -#include "amd/addrlib/inc/addrinterface.h" #include "ac_formats.h" static enum radeon_surf_mode si_choose_tiling(struct si_screen *sscreen, diff --git a/src/gallium/drivers/radeonsi/si_vpe.h b/src/gallium/drivers/radeonsi/si_vpe.h index 2188228b67c..28b70f4e99a 100644 --- a/src/gallium/drivers/radeonsi/si_vpe.h +++ b/src/gallium/drivers/radeonsi/si_vpe.h @@ -30,9 +30,8 @@ #include "pipe/p_screen.h" #include "pipe/p_video_codec.h" -#include "vl/vl_video_buffer.h" +#include "vl/vl_defines.h" #include "vpelib/inc/vpelib.h" -#include "si_video.h" /* The buffer size of cmd_buf and emb_buf in bytes * diff --git a/src/gallium/include/winsys/radeon_winsys.h b/src/gallium/include/winsys/radeon_winsys.h index 8611508159e..c78460a9399 100644 --- a/src/gallium/include/winsys/radeon_winsys.h +++ b/src/gallium/include/winsys/radeon_winsys.h @@ -24,12 +24,13 @@ #define RADEON_FLUSH_ASYNC_START_NEXT_GFX_IB_NOW \ (PIPE_FLUSH_ASYNC | RADEON_FLUSH_START_NEXT_GFX_IB_NOW) -#include "amd/common/ac_cmdbuf.h" +#include "amd/common/ac_cmdbuf_base.h" #include "amd/common/ac_gpu_info.h" #include "amd/common/ac_surface.h" -#include "amd/common/ac_pm4.h" #include "pipebuffer/pb_buffer.h" +struct ac_pm4_state; + /* Tiling flags. */ enum radeon_bo_layout { diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_userq.c b/src/gallium/winsys/amdgpu/drm/amdgpu_userq.c index f6d3668b52a..fa990b39939 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_userq.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_userq.c @@ -7,6 +7,7 @@ #include "amdgpu_bo.h" #include "amdgpu_cs.h" #include "ac_linux_drm.h" +#include "ac_pm4.h" #include "sid.h" #include "util/log.h"