From 1249937b5d7f337e96ece718ecb94e5f0d6fc068 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Wed, 6 Sep 2023 09:44:46 -0500 Subject: [PATCH] nvk: Clean up includes Drop a bunch of totally unnecessary stuff from xf86drm.h from nvk_private.h and limit it to vk_util and vk_log. In particular, we drop nvk_entrypoints.h which is auto-generated, allowing NVK headers to be included in other parts of the tree. Part-of: --- src/nouveau/vulkan/nvk_buffer.c | 1 + src/nouveau/vulkan/nvk_buffer_view.c | 3 ++- src/nouveau/vulkan/nvk_cmd_buffer.c | 3 +++ src/nouveau/vulkan/nvk_cmd_clear.c | 1 + src/nouveau/vulkan/nvk_cmd_copy.c | 5 +++-- src/nouveau/vulkan/nvk_cmd_dispatch.c | 1 + src/nouveau/vulkan/nvk_cmd_draw.c | 1 + src/nouveau/vulkan/nvk_cmd_meta.c | 1 + src/nouveau/vulkan/nvk_cmd_pool.c | 1 + src/nouveau/vulkan/nvk_compute_pipeline.c | 2 ++ src/nouveau/vulkan/nvk_descriptor_set.c | 2 ++ src/nouveau/vulkan/nvk_descriptor_set_layout.c | 3 +++ src/nouveau/vulkan/nvk_descriptor_set_layout.h | 5 +++-- src/nouveau/vulkan/nvk_device.c | 6 +++++- src/nouveau/vulkan/nvk_device_memory.c | 2 ++ src/nouveau/vulkan/nvk_event.c | 1 + src/nouveau/vulkan/nvk_format.c | 6 ++++-- src/nouveau/vulkan/nvk_graphics_pipeline.c | 5 ++++- src/nouveau/vulkan/nvk_image.c | 1 + src/nouveau/vulkan/nvk_image.h | 6 +++--- src/nouveau/vulkan/nvk_image_view.c | 6 ++++-- src/nouveau/vulkan/nvk_instance.c | 4 +++- src/nouveau/vulkan/nvk_nir_lower_descriptors.c | 2 ++ src/nouveau/vulkan/nvk_physical_device.c | 3 +-- src/nouveau/vulkan/nvk_pipeline.c | 6 +++--- src/nouveau/vulkan/nvk_private.h | 13 ++----------- src/nouveau/vulkan/nvk_query_pool.c | 14 +++++++++----- src/nouveau/vulkan/nvk_queue.c | 2 ++ src/nouveau/vulkan/nvk_sampler.c | 7 +++++-- src/nouveau/vulkan/nvk_shader.c | 5 ++--- src/nouveau/vulkan/nvk_shader.h | 5 +++-- 31 files changed, 80 insertions(+), 43 deletions(-) diff --git a/src/nouveau/vulkan/nvk_buffer.c b/src/nouveau/vulkan/nvk_buffer.c index aa84909bda4..d851eb3c450 100644 --- a/src/nouveau/vulkan/nvk_buffer.c +++ b/src/nouveau/vulkan/nvk_buffer.c @@ -1,5 +1,6 @@ #include "nvk_buffer.h" +#include "nvk_entrypoints.h" #include "nvk_device.h" #include "nvk_device_memory.h" #include "nvk_physical_device.h" diff --git a/src/nouveau/vulkan/nvk_buffer_view.c b/src/nouveau/vulkan/nvk_buffer_view.c index ea85b3f00fa..c0a505357b3 100644 --- a/src/nouveau/vulkan/nvk_buffer_view.c +++ b/src/nouveau/vulkan/nvk_buffer_view.c @@ -3,11 +3,12 @@ #include "nil_format.h" #include "nil_image.h" #include "nvk_buffer.h" +#include "nvk_entrypoints.h" #include "nvk_device.h" #include "nvk_format.h" #include "nvk_physical_device.h" -#include "vulkan/util/vk_format.h" +#include "vk_format.h" VkFormatFeatureFlags2 nvk_get_buffer_format_features(struct nvk_physical_device *pdev, diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c index c45798ddaf8..8ec870a2059 100644 --- a/src/nouveau/vulkan/nvk_cmd_buffer.c +++ b/src/nouveau/vulkan/nvk_cmd_buffer.c @@ -6,10 +6,13 @@ #include "nvk_descriptor_set_layout.h" #include "nvk_device.h" #include "nvk_device_memory.h" +#include "nvk_entrypoints.h" #include "nvk_mme.h" #include "nvk_physical_device.h" #include "nvk_pipeline.h" +#include "vk_pipeline_layout.h" + #include "nouveau_context.h" #include "nouveau/nouveau.h" diff --git a/src/nouveau/vulkan/nvk_cmd_clear.c b/src/nouveau/vulkan/nvk_cmd_clear.c index 48b6b513f36..652cf672643 100644 --- a/src/nouveau/vulkan/nvk_cmd_clear.c +++ b/src/nouveau/vulkan/nvk_cmd_clear.c @@ -1,6 +1,7 @@ #include "nvk_cmd_buffer.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_image.h" #include "nvk_image_view.h" #include "nvk_mme.h" diff --git a/src/nouveau/vulkan/nvk_cmd_copy.c b/src/nouveau/vulkan/nvk_cmd_copy.c index b03a83b1ae7..33f4d4e12a1 100644 --- a/src/nouveau/vulkan/nvk_cmd_copy.c +++ b/src/nouveau/vulkan/nvk_cmd_copy.c @@ -1,14 +1,15 @@ #include "nvk_cmd_buffer.h" -#include "vulkan/util/vk_format.h" - #include "nvk_buffer.h" #include "nvk_device.h" #include "nvk_device_memory.h" +#include "nvk_entrypoints.h" #include "nvk_format.h" #include "nvk_image.h" #include "nvk_physical_device.h" +#include "vk_format.h" + #include "nouveau_bo.h" #include "nouveau_context.h" diff --git a/src/nouveau/vulkan/nvk_cmd_dispatch.c b/src/nouveau/vulkan/nvk_cmd_dispatch.c index 53a0042cca5..6b5f3944eb8 100644 --- a/src/nouveau/vulkan/nvk_cmd_dispatch.c +++ b/src/nouveau/vulkan/nvk_cmd_dispatch.c @@ -2,6 +2,7 @@ #include "nvk_cmd_buffer.h" #include "nvk_descriptor_set.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_mme.h" #include "nvk_physical_device.h" #include "nvk_pipeline.h" diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 3e7c6659f80..4fb204737a7 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -1,4 +1,5 @@ #include "nvk_buffer.h" +#include "nvk_entrypoints.h" #include "nvk_cmd_buffer.h" #include "nvk_device.h" #include "nvk_format.h" diff --git a/src/nouveau/vulkan/nvk_cmd_meta.c b/src/nouveau/vulkan/nvk_cmd_meta.c index ac3ac99c2ce..c75c485ac3e 100644 --- a/src/nouveau/vulkan/nvk_cmd_meta.c +++ b/src/nouveau/vulkan/nvk_cmd_meta.c @@ -1,6 +1,7 @@ #include "nvk_buffer.h" #include "nvk_cmd_buffer.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_image.h" #include "nvk_physical_device.h" diff --git a/src/nouveau/vulkan/nvk_cmd_pool.c b/src/nouveau/vulkan/nvk_cmd_pool.c index 670a40069ea..cb4eb0d41f9 100644 --- a/src/nouveau/vulkan/nvk_cmd_pool.c +++ b/src/nouveau/vulkan/nvk_cmd_pool.c @@ -1,6 +1,7 @@ #include "nvk_cmd_pool.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_physical_device.h" static VkResult diff --git a/src/nouveau/vulkan/nvk_compute_pipeline.c b/src/nouveau/vulkan/nvk_compute_pipeline.c index cd0382f9f6f..fe922db8257 100644 --- a/src/nouveau/vulkan/nvk_compute_pipeline.c +++ b/src/nouveau/vulkan/nvk_compute_pipeline.c @@ -3,8 +3,10 @@ #include "nvk_physical_device.h" #include "nvk_pipeline.h" #include "nvk_shader.h" + #include "vk_nir.h" #include "vk_pipeline.h" +#include "vk_pipeline_layout.h" #include "nouveau_bo.h" #include "nouveau_context.h" diff --git a/src/nouveau/vulkan/nvk_descriptor_set.c b/src/nouveau/vulkan/nvk_descriptor_set.c index d8b300d9a15..d78115e1acc 100644 --- a/src/nouveau/vulkan/nvk_descriptor_set.c +++ b/src/nouveau/vulkan/nvk_descriptor_set.c @@ -4,9 +4,11 @@ #include "nvk_buffer_view.h" #include "nvk_descriptor_set_layout.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_image_view.h" #include "nvk_physical_device.h" #include "nvk_sampler.h" + #include "nouveau_bo.h" static inline uint32_t diff --git a/src/nouveau/vulkan/nvk_descriptor_set_layout.c b/src/nouveau/vulkan/nvk_descriptor_set_layout.c index 27bdc0fc482..cca6b089234 100644 --- a/src/nouveau/vulkan/nvk_descriptor_set_layout.c +++ b/src/nouveau/vulkan/nvk_descriptor_set_layout.c @@ -2,8 +2,11 @@ #include "nvk_descriptor_set.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_sampler.h" +#include "vk_pipeline_layout.h" + #include "util/mesa-sha1.h" static bool diff --git a/src/nouveau/vulkan/nvk_descriptor_set_layout.h b/src/nouveau/vulkan/nvk_descriptor_set_layout.h index b929b3b650e..d8f1d1fb3b1 100644 --- a/src/nouveau/vulkan/nvk_descriptor_set_layout.h +++ b/src/nouveau/vulkan/nvk_descriptor_set_layout.h @@ -3,11 +3,12 @@ #include "nvk_private.h" -#include "vulkan/runtime/vk_descriptor_set_layout.h" -#include "vulkan/runtime/vk_object.h" +#include "vk_descriptor_set_layout.h" +#include "vk_object.h" struct nvk_device; struct nvk_sampler; +struct vk_pipeline_layout; struct nvk_descriptor_set_binding_layout { /* The type of the descriptors in this binding */ diff --git a/src/nouveau/vulkan/nvk_device.c b/src/nouveau/vulkan/nvk_device.c index 95848dbc0d4..cf1f2e98ec8 100644 --- a/src/nouveau/vulkan/nvk_device.c +++ b/src/nouveau/vulkan/nvk_device.c @@ -1,12 +1,16 @@ #include "nvk_device.h" #include "nvk_cmd_buffer.h" +#include "nvk_entrypoints.h" #include "nvk_instance.h" #include "nvk_physical_device.h" +#include "vulkan/wsi/wsi_common.h" + #include "nouveau_context.h" -#include "vulkan/wsi/wsi_common.h" +#include +#include #include "cl9097.h" #include "clb097.h" diff --git a/src/nouveau/vulkan/nvk_device_memory.c b/src/nouveau/vulkan/nvk_device_memory.c index 9ba10619aed..930a9b511e8 100644 --- a/src/nouveau/vulkan/nvk_device_memory.c +++ b/src/nouveau/vulkan/nvk_device_memory.c @@ -3,8 +3,10 @@ #include "nouveau_bo.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_image.h" #include "nvk_physical_device.h" + #include "nv_push.h" #include diff --git a/src/nouveau/vulkan/nvk_event.c b/src/nouveau/vulkan/nvk_event.c index fda6f1af3b4..ad2d8f6ac29 100644 --- a/src/nouveau/vulkan/nvk_event.c +++ b/src/nouveau/vulkan/nvk_event.c @@ -2,6 +2,7 @@ #include "nvk_cmd_buffer.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_mme.h" #include "nvk_cl906f.h" diff --git a/src/nouveau/vulkan/nvk_format.c b/src/nouveau/vulkan/nvk_format.c index 8d8b112f0ae..f182d931f6e 100644 --- a/src/nouveau/vulkan/nvk_format.c +++ b/src/nouveau/vulkan/nvk_format.c @@ -1,15 +1,17 @@ #include "nvk_format.h" #include "nvk_buffer_view.h" +#include "nvk_entrypoints.h" #include "nvk_image.h" #include "nvk_physical_device.h" +#include "vk_enum_defines.h" +#include "vk_format.h" + #include "nvtypes.h" #include "classes/cl902d.h" #include "classes/cl9097.h" #include "classes/cl90c0.h" -#include "vulkan/util/vk_enum_defines.h" -#include "vulkan/util/vk_format.h" #define VA_FMT(vk_fmt, widths, swap_rb, type) \ [VK_FORMAT_##vk_fmt] = \ diff --git a/src/nouveau/vulkan/nvk_graphics_pipeline.c b/src/nouveau/vulkan/nvk_graphics_pipeline.c index 3813f2dcd65..5bf09a13f92 100644 --- a/src/nouveau/vulkan/nvk_graphics_pipeline.c +++ b/src/nouveau/vulkan/nvk_graphics_pipeline.c @@ -3,9 +3,12 @@ #include "nvk_device.h" #include "nvk_physical_device.h" #include "nvk_shader.h" -#include "nv_push.h" + #include "vk_nir.h" #include "vk_pipeline.h" +#include "vk_pipeline_layout.h" + +#include "nv_push.h" #include "nouveau_context.h" diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index ae1a573db98..2f0642bc62b 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -2,6 +2,7 @@ #include "nvk_device.h" #include "nvk_device_memory.h" +#include "nvk_entrypoints.h" #include "nvk_format.h" #include "nvk_physical_device.h" diff --git a/src/nouveau/vulkan/nvk_image.h b/src/nouveau/vulkan/nvk_image.h index da0cf81fe22..6023f018b7d 100644 --- a/src/nouveau/vulkan/nvk_image.h +++ b/src/nouveau/vulkan/nvk_image.h @@ -2,12 +2,12 @@ #define NVK_IMAGE_H 1 #include "nvk_private.h" -#include "nvk_device_memory.h" + +#include "vk_image.h" #include "nil_image.h" -#include "nouveau_bo.h" -#include "vulkan/runtime/vk_image.h" +struct nvk_device_memory; struct nvk_physical_device; static VkFormatFeatureFlags2 diff --git a/src/nouveau/vulkan/nvk_image_view.c b/src/nouveau/vulkan/nvk_image_view.c index c732cda9249..24ffd6f3208 100644 --- a/src/nouveau/vulkan/nvk_image_view.c +++ b/src/nouveau/vulkan/nvk_image_view.c @@ -1,10 +1,12 @@ #include "nvk_image_view.h" #include "nvk_device.h" -#include "nvk_physical_device.h" +#include "nvk_entrypoints.h" #include "nvk_format.h" #include "nvk_image.h" -#include "vulkan/util/vk_format.h" +#include "nvk_physical_device.h" + +#include "vk_format.h" static enum nil_view_type vk_image_view_type_to_nil_view_type(VkImageViewType view_type) diff --git a/src/nouveau/vulkan/nvk_instance.c b/src/nouveau/vulkan/nvk_instance.c index 00447aed0f6..0c266ddea8e 100644 --- a/src/nouveau/vulkan/nvk_instance.c +++ b/src/nouveau/vulkan/nvk_instance.c @@ -1,10 +1,12 @@ #include "nvk_instance.h" +#include "nvk_entrypoints.h" #include "nvk_physical_device.h" -#include "util/build_id.h" #include "vulkan/wsi/wsi_common.h" +#include "util/build_id.h" + VKAPI_ATTR VkResult VKAPI_CALL nvk_EnumerateInstanceVersion(uint32_t *pApiVersion) { diff --git a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c index 9a8e6ed661c..653b0b8126e 100644 --- a/src/nouveau/vulkan/nvk_nir_lower_descriptors.c +++ b/src/nouveau/vulkan/nvk_nir_lower_descriptors.c @@ -2,7 +2,9 @@ #include "nvk_descriptor_set.h" #include "nvk_descriptor_set_layout.h" #include "nvk_shader.h" + #include "vk_pipeline.h" +#include "vk_pipeline_layout.h" #include "nir_builder.h" #include "nir_deref.h" diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 7e0834f44aa..41f2dbad948 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -17,6 +17,7 @@ #include #include +#include #include "cl90c0.h" #include "cl91c0.h" @@ -25,7 +26,6 @@ #include "cla1c0.h" #include "clb097.h" #include "clb0c0.h" -#include "clb097.h" #include "clb197.h" #include "clb1c0.h" #include "clc0c0.h" @@ -33,7 +33,6 @@ #include "clc3c0.h" #include "clc597.h" #include "clc5c0.h" -#include "clc597.h" #include "clc997.h" PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL diff --git a/src/nouveau/vulkan/nvk_pipeline.c b/src/nouveau/vulkan/nvk_pipeline.c index c8f06f7d70a..d7875969543 100644 --- a/src/nouveau/vulkan/nvk_pipeline.c +++ b/src/nouveau/vulkan/nvk_pipeline.c @@ -1,8 +1,8 @@ - -#include "nvk_private.h" -#include "nvk_device.h" #include "nvk_pipeline.h" +#include "nvk_device.h" +#include "nvk_entrypoints.h" + #include "vk_pipeline_cache.h" struct nvk_pipeline * diff --git a/src/nouveau/vulkan/nvk_private.h b/src/nouveau/vulkan/nvk_private.h index e322bfb3ea5..8ac7b2358ae 100644 --- a/src/nouveau/vulkan/nvk_private.h +++ b/src/nouveau/vulkan/nvk_private.h @@ -3,17 +3,8 @@ #include -#include "nvk_entrypoints.h" - -#include "util/log.h" -#include "util/u_memory.h" -#include "vulkan/runtime/vk_log.h" -#include "vulkan/util/vk_alloc.h" -#include "vulkan/util/vk_util.h" -#include "vulkan/runtime/vk_pipeline_layout.h" - -#include -#include +#include "vk_log.h" +#include "vk_util.h" #define NVK_MAX_SETS 8 #define NVK_MAX_PUSH_SIZE 128 diff --git a/src/nouveau/vulkan/nvk_query_pool.c b/src/nouveau/vulkan/nvk_query_pool.c index 5674e8fbf2b..cab52987d43 100644 --- a/src/nouveau/vulkan/nvk_query_pool.c +++ b/src/nouveau/vulkan/nvk_query_pool.c @@ -3,19 +3,23 @@ #include "nvk_buffer.h" #include "nvk_cmd_buffer.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_event.h" #include "nvk_mme.h" #include "nvk_physical_device.h" #include "nvk_pipeline.h" -#include "compiler/nir/nir.h" -#include "compiler/nir/nir_builder.h" -#include "nouveau_bo.h" -#include "nouveau_context.h" -#include "util/os_time.h" #include "vk_meta.h" #include "vk_pipeline.h" +#include "compiler/nir/nir.h" +#include "compiler/nir/nir_builder.h" + +#include "nouveau_bo.h" +#include "nouveau_context.h" + +#include "util/os_time.h" + #include "nvk_cl906f.h" #include "nvk_cl9097.h" #include "nvk_cla0c0.h" diff --git a/src/nouveau/vulkan/nvk_queue.c b/src/nouveau/vulkan/nvk_queue.c index 8b7587118c6..a13c7e76a40 100644 --- a/src/nouveau/vulkan/nvk_queue.c +++ b/src/nouveau/vulkan/nvk_queue.c @@ -7,6 +7,8 @@ #include "nouveau_context.h" +#include + #include "nvk_cl9097.h" #include "nvk_cl90b5.h" #include "nvk_cla0c0.h" diff --git a/src/nouveau/vulkan/nvk_sampler.c b/src/nouveau/vulkan/nvk_sampler.c index 4e7fa3af853..1a5be9ca407 100644 --- a/src/nouveau/vulkan/nvk_sampler.c +++ b/src/nouveau/vulkan/nvk_sampler.c @@ -1,14 +1,17 @@ #include "nvk_sampler.h" #include "nvk_device.h" +#include "nvk_entrypoints.h" #include "nvk_physical_device.h" + +#include "vk_format.h" +#include "vk_sampler.h" + #include "nouveau_context.h" #include "util/bitpack_helpers.h" #include "util/format/format_utils.h" #include "util/format_srgb.h" -#include "vk_format.h" -#include "vk_sampler.h" #include "cla097.h" #include "clb197.h" diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c index 957fa0e63ec..9008457d3e4 100644 --- a/src/nouveau/vulkan/nvk_shader.c +++ b/src/nouveau/vulkan/nvk_shader.c @@ -7,17 +7,16 @@ #include "nvk_pipeline.h" #include "nvk_sampler.h" -#include "nouveau_bo.h" -#include "nouveau_context.h" #include "vk_nir_convert_ycbcr.h" #include "vk_pipeline.h" +#include "vk_pipeline_layout.h" #include "vk_shader_module.h" #include "vk_ycbcr_conversion.h" #include "nir.h" #include "nir_builder.h" +#include "nir_xfb_info.h" #include "compiler/spirv/nir_spirv.h" -#include "compiler/nir/nir_xfb_info.h" #include "nv50_ir_driver.h" diff --git a/src/nouveau/vulkan/nvk_shader.h b/src/nouveau/vulkan/nvk_shader.h index 54d0dfdb15d..c60a2e60884 100644 --- a/src/nouveau/vulkan/nvk_shader.h +++ b/src/nouveau/vulkan/nvk_shader.h @@ -7,11 +7,12 @@ #include "nir.h" #include "nouveau_bo.h" -struct vk_shader_module; -struct vk_pipeline_robustness_state; struct nvk_device; struct nvk_physical_device; struct nvk_pipeline_compilation_ctx; +struct vk_pipeline_layout; +struct vk_pipeline_robustness_state; +struct vk_shader_module; #define GF100_SHADER_HEADER_SIZE (20 * 4) #define TU102_SHADER_HEADER_SIZE (32 * 4)