From 2de95773b9cc366c4d4b1339a993e31f8812b2f2 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Thu, 21 Dec 2023 14:25:36 +0100 Subject: [PATCH] panvk: Kill panvk_private.h Explicitly include the headers we need in the various .{c,h} files and remove panvk_private.h. Signed-off-by: Boris Brezillon Acked-by: Erik Faye-Lund Reviewed-by: Mary Guillemard Reviewed-by: Rebecca Mckeever Part-of: --- src/panfrost/vulkan/meson.build | 1 - src/panfrost/vulkan/panvk_android.c | 2 - src/panfrost/vulkan/panvk_buffer.c | 4 +- src/panfrost/vulkan/panvk_cmd_buffer.c | 4 +- src/panfrost/vulkan/panvk_cmd_buffer.h | 1 - src/panfrost/vulkan/panvk_cmd_pool.c | 5 +- src/panfrost/vulkan/panvk_descriptor_set.c | 6 +- src/panfrost/vulkan/panvk_device_memory.c | 4 +- src/panfrost/vulkan/panvk_event.c | 4 +- src/panfrost/vulkan/panvk_image.c | 3 +- src/panfrost/vulkan/panvk_instance.c | 9 +- src/panfrost/vulkan/panvk_mempool.c | 3 +- src/panfrost/vulkan/panvk_physical_device.c | 3 +- src/panfrost/vulkan/panvk_pipeline.c | 2 +- src/panfrost/vulkan/panvk_private.h | 112 ------------------ src/panfrost/vulkan/panvk_query.c | 3 +- src/panfrost/vulkan/panvk_queue.h | 2 - src/panfrost/vulkan/panvk_shader.c | 2 +- src/panfrost/vulkan/panvk_vX_buffer_view.c | 3 +- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 2 +- src/panfrost/vulkan/panvk_vX_descriptor_set.c | 4 +- .../vulkan/panvk_vX_descriptor_set_layout.c | 3 +- src/panfrost/vulkan/panvk_vX_device.c | 1 + src/panfrost/vulkan/panvk_vX_image_view.c | 3 +- src/panfrost/vulkan/panvk_vX_meta.c | 1 - src/panfrost/vulkan/panvk_vX_meta_blit.c | 2 +- src/panfrost/vulkan/panvk_vX_meta_clear.c | 2 +- src/panfrost/vulkan/panvk_vX_meta_copy.c | 2 +- .../vulkan/panvk_vX_nir_lower_descriptors.c | 1 - src/panfrost/vulkan/panvk_vX_pipeline.c | 2 +- .../vulkan/panvk_vX_pipeline_layout.c | 3 +- src/panfrost/vulkan/panvk_vX_queue.c | 4 +- src/panfrost/vulkan/panvk_vX_sampler.c | 4 +- src/panfrost/vulkan/panvk_vX_shader.c | 2 +- src/panfrost/vulkan/panvk_wsi.c | 1 - 35 files changed, 62 insertions(+), 148 deletions(-) delete mode 100644 src/panfrost/vulkan/panvk_private.h diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build index 36c4cdf9673..339c1041f0e 100644 --- a/src/panfrost/vulkan/meson.build +++ b/src/panfrost/vulkan/meson.build @@ -46,7 +46,6 @@ libpanvk_files = files( 'panvk_mempool.c', 'panvk_physical_device.c', 'panvk_pipeline.c', - 'panvk_private.h', 'panvk_priv_bo.c', 'panvk_query.c', 'panvk_shader.c', diff --git a/src/panfrost/vulkan/panvk_android.c b/src/panfrost/vulkan/panvk_android.c index e8e85e1be3e..42b1f951a9c 100644 --- a/src/panfrost/vulkan/panvk_android.c +++ b/src/panfrost/vulkan/panvk_android.c @@ -6,8 +6,6 @@ * SPDX-License-Identifier: MIT */ -#include "panvk_private.h" - #include #include #include diff --git a/src/panfrost/vulkan/panvk_buffer.c b/src/panfrost/vulkan/panvk_buffer.c index 66048cf3c68..1422f9d32b3 100644 --- a/src/panfrost/vulkan/panvk_buffer.c +++ b/src/panfrost/vulkan/panvk_buffer.c @@ -6,7 +6,9 @@ #include "panvk_buffer.h" #include "panvk_device.h" #include "panvk_device_memory.h" -#include "panvk_private.h" +#include "panvk_entrypoints.h" + +#include "vk_log.h" VKAPI_ATTR VkDeviceAddress VKAPI_CALL panvk_GetBufferDeviceAddress(VkDevice _device, diff --git a/src/panfrost/vulkan/panvk_cmd_buffer.c b/src/panfrost/vulkan/panvk_cmd_buffer.c index 580be85b1d9..999ad908a17 100644 --- a/src/panfrost/vulkan/panvk_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_cmd_buffer.c @@ -30,15 +30,17 @@ #include "panvk_buffer.h" #include "panvk_cmd_pool.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_physical_device.h" #include "panvk_pipeline.h" #include "panvk_pipeline_layout.h" -#include "panvk_private.h" #include "pan_encoder.h" #include "pan_props.h" #include "util/rounding.h" + +#include "vk_alloc.h" #include "vk_format.h" #include "vk_framebuffer.h" diff --git a/src/panfrost/vulkan/panvk_cmd_buffer.h b/src/panfrost/vulkan/panvk_cmd_buffer.h index bcf2ecdd98b..8ecbcb8dc37 100644 --- a/src/panfrost/vulkan/panvk_cmd_buffer.h +++ b/src/panfrost/vulkan/panvk_cmd_buffer.h @@ -16,7 +16,6 @@ #include "panvk_macros.h" #include "panvk_mempool.h" #include "panvk_pipeline.h" -#include "panvk_private.h" #include "panvk_shader.h" #include "pan_jc.h" diff --git a/src/panfrost/vulkan/panvk_cmd_pool.c b/src/panfrost/vulkan/panvk_cmd_pool.c index 5a3a790965a..5fbd37c86f4 100644 --- a/src/panfrost/vulkan/panvk_cmd_pool.c +++ b/src/panfrost/vulkan/panvk_cmd_pool.c @@ -11,7 +11,10 @@ #include "panvk_cmd_pool.h" #include "panvk_device.h" -#include "panvk_private.h" +#include "panvk_entrypoints.h" + +#include "vk_alloc.h" +#include "vk_log.h" VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateCommandPool(VkDevice _device, diff --git a/src/panfrost/vulkan/panvk_descriptor_set.c b/src/panfrost/vulkan/panvk_descriptor_set.c index 723ce15f50d..28e2d466bf9 100644 --- a/src/panfrost/vulkan/panvk_descriptor_set.c +++ b/src/panfrost/vulkan/panvk_descriptor_set.c @@ -27,8 +27,9 @@ #include "panvk_descriptor_set.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" +#include "panvk_pipeline_layout.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" #include #include @@ -36,8 +37,9 @@ #include #include -#include "util/mesa-sha1.h" +#include "vk_alloc.h" #include "vk_descriptors.h" +#include "vk_log.h" #include "vk_util.h" VKAPI_ATTR VkResult VKAPI_CALL diff --git a/src/panfrost/vulkan/panvk_device_memory.c b/src/panfrost/vulkan/panvk_device_memory.c index 101ff240aee..349c6ba25cf 100644 --- a/src/panfrost/vulkan/panvk_device_memory.c +++ b/src/panfrost/vulkan/panvk_device_memory.c @@ -9,7 +9,9 @@ #include "panvk_device.h" #include "panvk_device_memory.h" -#include "panvk_private.h" +#include "panvk_entrypoints.h" + +#include "vk_log.h" VKAPI_ATTR VkResult VKAPI_CALL panvk_AllocateMemory(VkDevice _device, diff --git a/src/panfrost/vulkan/panvk_event.c b/src/panfrost/vulkan/panvk_event.c index 59421480ce9..c8acc735b9f 100644 --- a/src/panfrost/vulkan/panvk_event.c +++ b/src/panfrost/vulkan/panvk_event.c @@ -5,7 +5,9 @@ #include "panvk_event.h" #include "panvk_device.h" -#include "panvk_private.h" +#include "panvk_entrypoints.h" + +#include "vk_log.h" VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo, diff --git a/src/panfrost/vulkan/panvk_image.c b/src/panfrost/vulkan/panvk_image.c index b7139e4d244..7090c29d68f 100644 --- a/src/panfrost/vulkan/panvk_image.c +++ b/src/panfrost/vulkan/panvk_image.c @@ -30,15 +30,16 @@ #include "panvk_device.h" #include "panvk_device_memory.h" +#include "panvk_entrypoints.h" #include "panvk_image.h" #include "panvk_instance.h" #include "panvk_physical_device.h" -#include "panvk_private.h" #include "drm-uapi/drm_fourcc.h" #include "util/u_atomic.h" #include "util/u_debug.h" #include "vk_format.h" +#include "vk_log.h" #include "vk_object.h" #include "vk_util.h" diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c index e8eacb58cac..0755cbff265 100644 --- a/src/panfrost/vulkan/panvk_instance.c +++ b/src/panfrost/vulkan/panvk_instance.c @@ -15,7 +15,14 @@ #include "panvk_entrypoints.h" #include "panvk_instance.h" #include "panvk_physical_device.h" -#include "panvk_private.h" + +#ifdef HAVE_VALGRIND +#include +#include +#define VG(x) x +#else +#define VG(x) +#endif static const struct debug_control panvk_debug_options[] = { {"startup", PANVK_DEBUG_STARTUP}, diff --git a/src/panfrost/vulkan/panvk_mempool.c b/src/panfrost/vulkan/panvk_mempool.c index d0a71e44b18..146693d7ff0 100644 --- a/src/panfrost/vulkan/panvk_mempool.c +++ b/src/panfrost/vulkan/panvk_mempool.c @@ -25,7 +25,8 @@ #include "panvk_mempool.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" + +#include "kmod/pan_kmod.h" void panvk_bo_pool_cleanup(struct panvk_bo_pool *bo_pool) diff --git a/src/panfrost/vulkan/panvk_physical_device.c b/src/panfrost/vulkan/panvk_physical_device.c index 6be284b9ca4..9fa6bdbbb5b 100644 --- a/src/panfrost/vulkan/panvk_physical_device.c +++ b/src/panfrost/vulkan/panvk_physical_device.c @@ -13,15 +13,16 @@ #include "util/disk_cache.h" +#include "vk_device.h" #include "vk_drm_syncobj.h" #include "vk_format.h" #include "vk_log.h" #include "vk_util.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_instance.h" #include "panvk_physical_device.h" -#include "panvk_private.h" #include "panvk_wsi.h" #include "pan_format.h" diff --git a/src/panfrost/vulkan/panvk_pipeline.c b/src/panfrost/vulkan/panvk_pipeline.c index 9ca48cdbf9a..c2845a26179 100644 --- a/src/panfrost/vulkan/panvk_pipeline.c +++ b/src/panfrost/vulkan/panvk_pipeline.c @@ -28,8 +28,8 @@ #include "panvk_pipeline.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" #include "nir/nir.h" #include "nir/nir_builder.h" diff --git a/src/panfrost/vulkan/panvk_private.h b/src/panfrost/vulkan/panvk_private.h deleted file mode 100644 index 1f1b15b3185..00000000000 --- a/src/panfrost/vulkan/panvk_private.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright © 2021 Collabora Ltd. - * - * derived from tu_private.h driver which is: - * Copyright © 2016 Red Hat. - * Copyright © 2016 Bas Nieuwenhuizen - * Copyright © 2015 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef PANVK_PRIVATE_H -#define PANVK_PRIVATE_H - -#include -#include -#include -#include -#include -#include -#include - -#include "c11/threads.h" -#include "compiler/shader_enums.h" -#include "util/list.h" -#include "util/macros.h" -#include "vk_alloc.h" -#include "vk_buffer.h" -#include "vk_buffer_view.h" -#include "vk_command_buffer.h" -#include "vk_command_pool.h" -#include "vk_descriptor_set_layout.h" -#include "vk_device.h" -#include "vk_device_memory.h" -#include "vk_image.h" -#include "vk_instance.h" -#include "vk_log.h" -#include "vk_object.h" -#include "vk_physical_device.h" -#include "vk_pipeline_layout.h" -#include "vk_queue.h" -#include "vk_sampler.h" -#include "vk_sync.h" -#include "wsi_common.h" - -#include "drm-uapi/panfrost_drm.h" - -#include "pan_blend.h" -#include "pan_blitter.h" -#include "pan_desc.h" -#include "pan_jc.h" -#include "pan_texture.h" -#include "panvk_descriptor_set.h" -#include "panvk_descriptor_set_layout.h" -#include "panvk_instance.h" -#include "panvk_macros.h" -#include "panvk_mempool.h" -#include "panvk_meta.h" -#include "panvk_physical_device.h" -#include "panvk_pipeline.h" -#include "panvk_pipeline_layout.h" -#include "panvk_shader.h" -#include "panvk_varyings.h" -#include "vk_extensions.h" - -#include "kmod/pan_kmod.h" - -/* Pre-declarations needed for WSI entrypoints */ -struct wl_surface; -struct wl_display; -typedef struct xcb_connection_t xcb_connection_t; -typedef uint32_t xcb_visualid_t; -typedef uint32_t xcb_window_t; - -#include -#include -#include - -#include "panvk_entrypoints.h" - -#define MAX_VERTEX_ATTRIBS 16 -#define MAX_VSC_PIPES 32 -#define MAX_SCISSORS 16 -#define MAX_DISCARD_RECTANGLES 4 -#define MAX_SAMPLES_LOG2 4 -#define NUM_META_FS_KEYS 13 -#define MAX_VIEWS 8 - -#define NUM_DEPTH_CLEAR_PIPELINES 3 - -struct panvk_device; -struct panvk_pipeline_layout; -struct panvk_queue; - -#endif /* PANVK_PRIVATE_H */ diff --git a/src/panfrost/vulkan/panvk_query.c b/src/panfrost/vulkan/panvk_query.c index 244648b4b18..c19728ee9b9 100644 --- a/src/panfrost/vulkan/panvk_query.c +++ b/src/panfrost/vulkan/panvk_query.c @@ -21,7 +21,8 @@ * DEALINGS IN THE SOFTWARE. */ -#include "panvk_private.h" +#include "panvk_entrypoints.h" +#include "panvk_macros.h" VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateQueryPool(VkDevice _device, diff --git a/src/panfrost/vulkan/panvk_queue.h b/src/panfrost/vulkan/panvk_queue.h index 4e5f4850b5c..4fe9687e4e5 100644 --- a/src/panfrost/vulkan/panvk_queue.h +++ b/src/panfrost/vulkan/panvk_queue.h @@ -10,8 +10,6 @@ #include "vk_queue.h" -#include "panvk_private.h" - struct panvk_queue { struct vk_queue vk; uint32_t sync; diff --git a/src/panfrost/vulkan/panvk_shader.c b/src/panfrost/vulkan/panvk_shader.c index fb178a1503e..79ae8b9550f 100644 --- a/src/panfrost/vulkan/panvk_shader.c +++ b/src/panfrost/vulkan/panvk_shader.c @@ -26,10 +26,10 @@ #include "panvk_shader.h" #include "panvk_device.h" -#include "panvk_private.h" #include "pan_shader.h" +#include "vk_alloc.h" #include "vk_util.h" void diff --git a/src/panfrost/vulkan/panvk_vX_buffer_view.c b/src/panfrost/vulkan/panvk_vX_buffer_view.c index 17cc8191b1a..2355e76a5d3 100644 --- a/src/panfrost/vulkan/panvk_vX_buffer_view.c +++ b/src/panfrost/vulkan/panvk_vX_buffer_view.c @@ -14,10 +14,11 @@ #include "panvk_buffer.h" #include "panvk_buffer_view.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" #include "vk_format.h" +#include "vk_log.h" VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(CreateBufferView)(VkDevice _device, diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index a769fa17d14..7b17eeb5ec4 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -32,6 +32,7 @@ #include "panvk_cmd_buffer.h" #include "panvk_cmd_pool.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_event.h" #include "panvk_image.h" #include "panvk_image_view.h" @@ -40,7 +41,6 @@ #include "panvk_pipeline.h" #include "panvk_pipeline_layout.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" #include "pan_blitter.h" #include "pan_desc.h" diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set.c b/src/panfrost/vulkan/panvk_vX_descriptor_set.c index 02d0a32ec37..70385cd400d 100644 --- a/src/panfrost/vulkan/panvk_vX_descriptor_set.c +++ b/src/panfrost/vulkan/panvk_vX_descriptor_set.c @@ -29,10 +29,10 @@ #include "panvk_buffer_view.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_image.h" #include "panvk_image_view.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" #include #include @@ -41,9 +41,11 @@ #include #include "util/mesa-sha1.h" +#include "vk_alloc.h" #include "vk_descriptor_update_template.h" #include "vk_descriptors.h" #include "vk_format.h" +#include "vk_log.h" #include "vk_util.h" #include "panvk_buffer.h" diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c b/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c index fdda9eb810b..d5e9e2b829e 100644 --- a/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c +++ b/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c @@ -4,12 +4,13 @@ */ #include "vk_descriptors.h" +#include "vk_log.h" #include "panvk_descriptor_set.h" #include "panvk_descriptor_set_layout.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_pipeline_layout.h" -#include "panvk_private.h" #include "panvk_sampler.h" #define PANVK_DESCRIPTOR_ALIGN 8 diff --git a/src/panfrost/vulkan/panvk_vX_device.c b/src/panfrost/vulkan/panvk_vX_device.c index e7b3aa29396..180fd814249 100644 --- a/src/panfrost/vulkan/panvk_vX_device.c +++ b/src/panfrost/vulkan/panvk_vX_device.c @@ -14,6 +14,7 @@ #include "panvk_cmd_buffer.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_instance.h" #include "panvk_macros.h" #include "panvk_physical_device.h" diff --git a/src/panfrost/vulkan/panvk_vX_image_view.c b/src/panfrost/vulkan/panvk_vX_image_view.c index b42816dfaa9..b8bc4999cbf 100644 --- a/src/panfrost/vulkan/panvk_vX_image_view.c +++ b/src/panfrost/vulkan/panvk_vX_image_view.c @@ -10,12 +10,13 @@ */ #include "vk_format.h" +#include "vk_log.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_image.h" #include "panvk_image_view.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" #include "genxml/gen_macros.h" diff --git a/src/panfrost/vulkan/panvk_vX_meta.c b/src/panfrost/vulkan/panvk_vX_meta.c index b5dd715bb76..29fb3f55731 100644 --- a/src/panfrost/vulkan/panvk_vX_meta.c +++ b/src/panfrost/vulkan/panvk_vX_meta.c @@ -28,7 +28,6 @@ #include "pan_shader.h" #include "panvk_device.h" -#include "panvk_private.h" #include "vk_format.h" diff --git a/src/panfrost/vulkan/panvk_vX_meta_blit.c b/src/panfrost/vulkan/panvk_vX_meta_blit.c index 5bb062ab66b..5b9bcfe060f 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_blit.c +++ b/src/panfrost/vulkan/panvk_vX_meta_blit.c @@ -28,9 +28,9 @@ #include "panvk_cmd_buffer.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_image.h" #include "panvk_physical_device.h" -#include "panvk_private.h" static void panvk_meta_blit(struct panvk_cmd_buffer *cmdbuf, diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c index be82064ef38..1060be57e16 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_clear.c +++ b/src/panfrost/vulkan/panvk_vX_meta_clear.c @@ -29,10 +29,10 @@ #include "panvk_cmd_buffer.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_image.h" #include "panvk_meta.h" #include "panvk_physical_device.h" -#include "panvk_private.h" #include "vk_format.h" #include "vk_render_pass.h" diff --git a/src/panfrost/vulkan/panvk_vX_meta_copy.c b/src/panfrost/vulkan/panvk_vX_meta_copy.c index b2e8dc959c3..a81ea7f36ec 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_copy.c +++ b/src/panfrost/vulkan/panvk_vX_meta_copy.c @@ -31,9 +31,9 @@ #include "panvk_buffer.h" #include "panvk_cmd_buffer.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_image.h" #include "panvk_physical_device.h" -#include "panvk_private.h" static mali_ptr panvk_meta_copy_img_emit_texture(struct pan_pool *desc_pool, diff --git a/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c b/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c index eef7333d7dd..c32234a1703 100644 --- a/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c +++ b/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c @@ -29,7 +29,6 @@ #include "panvk_device.h" #include "panvk_pipeline_layout.h" -#include "panvk_private.h" #include "panvk_shader.h" #include "nir.h" diff --git a/src/panfrost/vulkan/panvk_vX_pipeline.c b/src/panfrost/vulkan/panvk_vX_pipeline.c index 6cfa4afcb6d..25c632e29fa 100644 --- a/src/panfrost/vulkan/panvk_vX_pipeline.c +++ b/src/panfrost/vulkan/panvk_vX_pipeline.c @@ -28,10 +28,10 @@ #include "panvk_cmd_buffer.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_pipeline.h" #include "panvk_pipeline_layout.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" #include "panvk_shader.h" #include "nir/nir.h" diff --git a/src/panfrost/vulkan/panvk_vX_pipeline_layout.c b/src/panfrost/vulkan/panvk_vX_pipeline_layout.c index 63a59b83388..70296ef6a6d 100644 --- a/src/panfrost/vulkan/panvk_vX_pipeline_layout.c +++ b/src/panfrost/vulkan/panvk_vX_pipeline_layout.c @@ -6,11 +6,12 @@ #include "genxml/gen_macros.h" +#include "vk_log.h" + #include "panvk_device.h" #include "panvk_entrypoints.h" #include "panvk_macros.h" #include "panvk_pipeline_layout.h" -#include "panvk_private.h" #include "panvk_sampler.h" #include "panvk_shader.h" diff --git a/src/panfrost/vulkan/panvk_vX_queue.c b/src/panfrost/vulkan/panvk_vX_queue.c index d2e040317a5..ef4f55dab50 100644 --- a/src/panfrost/vulkan/panvk_vX_queue.c +++ b/src/panfrost/vulkan/panvk_vX_queue.c @@ -15,18 +15,20 @@ #include "panvk_cmd_buffer.h" #include "panvk_device.h" +#include "panvk_entrypoints.h" #include "panvk_event.h" #include "panvk_image.h" #include "panvk_image_view.h" #include "panvk_instance.h" #include "panvk_physical_device.h" #include "panvk_priv_bo.h" -#include "panvk_private.h" #include "panvk_queue.h" #include "vk_drm_syncobj.h" #include "vk_framebuffer.h" +#include "drm-uapi/panfrost_drm.h" + static void panvk_queue_submit_batch(struct panvk_queue *queue, struct panvk_batch *batch, uint32_t *bos, unsigned nr_bos, uint32_t *in_fences, diff --git a/src/panfrost/vulkan/panvk_vX_sampler.c b/src/panfrost/vulkan/panvk_vX_sampler.c index 3fb590880d9..b65ee8ff069 100644 --- a/src/panfrost/vulkan/panvk_vX_sampler.c +++ b/src/panfrost/vulkan/panvk_vX_sampler.c @@ -6,11 +6,13 @@ #include "genxml/gen_macros.h" #include "panvk_device.h" -#include "panvk_private.h" +#include "panvk_entrypoints.h" #include "panvk_sampler.h" #include "pan_encoder.h" +#include "vk_log.h" + static enum mali_mipmap_mode panvk_translate_sampler_mipmap_mode(VkSamplerMipmapMode mode) { diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c index 2b1c106a039..69f8b000b94 100644 --- a/src/panfrost/vulkan/panvk_vX_shader.c +++ b/src/panfrost/vulkan/panvk_vX_shader.c @@ -32,8 +32,8 @@ #include "panvk_device.h" #include "panvk_instance.h" #include "panvk_physical_device.h" +#include "panvk_pipeline.h" #include "panvk_pipeline_layout.h" -#include "panvk_private.h" #include "panvk_shader.h" #include "spirv/nir_spirv.h" diff --git a/src/panfrost/vulkan/panvk_wsi.c b/src/panfrost/vulkan/panvk_wsi.c index d570f4b0c25..f40efb280ce 100644 --- a/src/panfrost/vulkan/panvk_wsi.c +++ b/src/panfrost/vulkan/panvk_wsi.c @@ -28,7 +28,6 @@ #include "panvk_wsi.h" #include "panvk_instance.h" #include "panvk_physical_device.h" -#include "panvk_private.h" #include "vk_util.h" #include "wsi_common.h"