From db103c56abe32d0dd81c3eec2f3b5e59d3aae695 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 8 Feb 2024 23:27:26 +0800 Subject: [PATCH] treewide: Remove vulkan/runtime vulkan/util prefix in include path This is for unify the include style of shared vulkan headers Signed-off-by: Yonggang Luo Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_descriptor_set.h | 4 ++-- src/amd/vulkan/radv_formats.c | 4 ++-- src/amd/vulkan/radv_image.c | 2 +- src/amd/vulkan/radv_pipeline_cache.c | 2 +- src/amd/vulkan/radv_shader.h | 2 +- src/broadcom/vulkan/v3dv_android.c | 2 +- src/broadcom/vulkan/v3dv_cmd_buffer.c | 2 +- src/broadcom/vulkan/v3dv_meta_copy.c | 2 +- src/broadcom/vulkan/v3dv_pipeline.c | 2 +- src/broadcom/vulkan/v3dv_pipeline_cache.c | 2 +- src/broadcom/vulkan/v3dvx_cmd_buffer.c | 2 +- src/broadcom/vulkan/v3dvx_formats.c | 2 +- src/freedreno/vulkan/tu_common.h | 2 +- src/gallium/drivers/zink/zink_compiler.c | 2 +- src/gallium/drivers/zink/zink_state.c | 2 +- src/gallium/drivers/zink/zink_types.h | 2 +- src/gallium/frontends/lavapipe/lvp_execute.c | 1 - src/imagination/vulkan/pvr_dump_csb.c | 2 +- src/imagination/vulkan/pvr_private.h | 2 +- src/intel/vulkan/anv_pipeline_cache.c | 2 +- src/intel/vulkan/anv_utrace.c | 2 +- src/intel/vulkan_hasvk/anv_pipeline_cache.c | 2 +- src/nouveau/vulkan/nvk_buffer.h | 2 +- src/nouveau/vulkan/nvk_buffer_view.h | 2 +- src/nouveau/vulkan/nvk_cmd_draw.c | 6 +++--- src/nouveau/vulkan/nvk_descriptor_set.h | 4 ++-- src/nouveau/vulkan/nvk_event.h | 2 +- src/nouveau/vulkan/nvk_image.c | 2 +- src/nouveau/vulkan/nvk_image_view.h | 2 +- src/nouveau/vulkan/nvk_instance.h | 2 +- src/nouveau/vulkan/nvk_physical_device.c | 6 +++--- src/nouveau/vulkan/nvk_physical_device.h | 4 ++-- src/nouveau/vulkan/nvk_sampler.h | 6 +++--- src/panfrost/vulkan/panvk_formats.c | 1 - src/vulkan/runtime/rmv/vk_rmv_common.c | 4 ++-- src/vulkan/runtime/rmv/vk_rmv_exporter.c | 2 +- src/vulkan/wsi/wsi_common_private.h | 4 ++-- 37 files changed, 47 insertions(+), 49 deletions(-) diff --git a/src/amd/vulkan/radv_descriptor_set.h b/src/amd/vulkan/radv_descriptor_set.h index 710037b8d8d..3bcbccfe902 100644 --- a/src/amd/vulkan/radv_descriptor_set.h +++ b/src/amd/vulkan/radv_descriptor_set.h @@ -26,8 +26,8 @@ #include "radv_constants.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" #include diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index 16e94160f47..5b61fe3d3dd 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/src/amd/vulkan/radv_formats.c @@ -29,14 +29,14 @@ #include "vk_format.h" #include "vk_android.h" +#include "vk_enum_defines.h" +#include "vk_format.h" #include "vk_util.h" #include "util/format_r11g11b10f.h" #include "util/format_rgb9e5.h" #include "util/format_srgb.h" #include "util/half_float.h" -#include "vulkan/util/vk_enum_defines.h" -#include "vulkan/util/vk_format.h" #include "ac_drm_fourcc.h" uint32_t diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 29a0ff599b3..0d99374572f 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -27,7 +27,6 @@ #include "util/u_atomic.h" #include "util/u_debug.h" -#include "vulkan/util/vk_format.h" #include "ac_drm_fourcc.h" #include "radv_debug.h" #include "radv_private.h" @@ -35,6 +34,7 @@ #include "sid.h" #include "vk_format.h" #include "vk_render_pass.h" +#include "vk_format.h" #include "vk_util.h" #include "gfx10_format_table.h" diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index 01117a79648..7d851eb9284 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -27,13 +27,13 @@ #include "util/mesa-sha1.h" #include "util/u_atomic.h" #include "util/u_debug.h" -#include "vulkan/util/vk_util.h" #include "aco_interface.h" #include "nir_serialize.h" #include "radv_debug.h" #include "radv_private.h" #include "radv_shader.h" #include "vk_pipeline.h" +#include "vk_util.h" static bool radv_is_cache_disabled(struct radv_device *device) diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 961316a5423..de15904e70a 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -30,7 +30,7 @@ #include "util/mesa-blake3.h" #include "util/u_math.h" -#include "vulkan/runtime/vk_pipeline_cache.h" +#include "vk_pipeline_cache.h" #include "vulkan/vulkan.h" #include "ac_binary.h" #include "ac_shader_util.h" diff --git a/src/broadcom/vulkan/v3dv_android.c b/src/broadcom/vulkan/v3dv_android.c index 7a16b59dd40..afb691e55d0 100644 --- a/src/broadcom/vulkan/v3dv_android.c +++ b/src/broadcom/vulkan/v3dv_android.c @@ -36,7 +36,7 @@ #include #include "vk_android.h" -#include "vulkan/util/vk_enum_defines.h" +#include "vk_enum_defines.h" #include "util/libsync.h" #include "util/log.h" diff --git a/src/broadcom/vulkan/v3dv_cmd_buffer.c b/src/broadcom/vulkan/v3dv_cmd_buffer.c index dda20edc157..587e03e12b3 100644 --- a/src/broadcom/vulkan/v3dv_cmd_buffer.c +++ b/src/broadcom/vulkan/v3dv_cmd_buffer.c @@ -24,8 +24,8 @@ #include "broadcom/common/v3d_csd.h" #include "v3dv_private.h" #include "util/u_pack_color.h" +#include "vk_common_entrypoints.h" #include "vk_util.h" -#include "vulkan/runtime/vk_common_entrypoints.h" void v3dv_job_add_bo(struct v3dv_job *job, struct v3dv_bo *bo) diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c index d7c04f5a863..0713b1b4084 100644 --- a/src/broadcom/vulkan/v3dv_meta_copy.c +++ b/src/broadcom/vulkan/v3dv_meta_copy.c @@ -26,7 +26,7 @@ #include "compiler/nir/nir_builder.h" #include "util/u_pack_color.h" -#include "vulkan/runtime/vk_common_entrypoints.h" +#include "vk_common_entrypoints.h" static uint32_t meta_blit_key_hash(const void *key) diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c index 146151b6ce9..ab8e86b6ef1 100644 --- a/src/broadcom/vulkan/v3dv_pipeline.c +++ b/src/broadcom/vulkan/v3dv_pipeline.c @@ -35,9 +35,9 @@ #include "util/u_atomic.h" #include "util/os_time.h" +#include "vk_format.h" #include "vk_nir_convert_ycbcr.h" #include "vk_pipeline.h" -#include "vulkan/util/vk_format.h" static VkResult compute_vpm_config(struct v3dv_pipeline *pipeline); diff --git a/src/broadcom/vulkan/v3dv_pipeline_cache.c b/src/broadcom/vulkan/v3dv_pipeline_cache.c index 3f58940c7da..d2124ee0b08 100644 --- a/src/broadcom/vulkan/v3dv_pipeline_cache.c +++ b/src/broadcom/vulkan/v3dv_pipeline_cache.c @@ -22,7 +22,7 @@ */ #include "v3dv_private.h" -#include "vulkan/util/vk_util.h" +#include "vk_util.h" #include "util/blob.h" #include "nir/nir_serialize.h" diff --git a/src/broadcom/vulkan/v3dvx_cmd_buffer.c b/src/broadcom/vulkan/v3dvx_cmd_buffer.c index 011f5c8e101..7e6c8132865 100644 --- a/src/broadcom/vulkan/v3dvx_cmd_buffer.c +++ b/src/broadcom/vulkan/v3dvx_cmd_buffer.c @@ -28,8 +28,8 @@ #include "broadcom/compiler/v3d_compiler.h" #include "util/half_float.h" -#include "vulkan/util/vk_format.h" #include "util/u_pack_color.h" +#include "vk_format.h" void v3dX(job_emit_binning_flush)(struct v3dv_job *job) diff --git a/src/broadcom/vulkan/v3dvx_formats.c b/src/broadcom/vulkan/v3dvx_formats.c index 10bec96e78a..4fe548faee0 100644 --- a/src/broadcom/vulkan/v3dvx_formats.c +++ b/src/broadcom/vulkan/v3dvx_formats.c @@ -26,9 +26,9 @@ #include "broadcom/cle/v3dx_pack.h" #include "util/format/u_format.h" -#include "vulkan/util/vk_util.h" #include "vk_enum_to_str.h" #include "vk_enum_defines.h" +#include "vk_util.h" #define SWIZ(x,y,z,w) { \ PIPE_SWIZZLE_##x, \ diff --git a/src/freedreno/vulkan/tu_common.h b/src/freedreno/vulkan/tu_common.h index 940d1b7f66d..986b464a2fa 100644 --- a/src/freedreno/vulkan/tu_common.h +++ b/src/freedreno/vulkan/tu_common.h @@ -68,12 +68,12 @@ #include #include "tu_entrypoints.h" -#include "vulkan/runtime/vk_common_entrypoints.h" #include "vk_format.h" #include "vk_image.h" #include "vk_command_buffer.h" #include "vk_command_pool.h" +#include "vk_common_entrypoints.h" #include "vk_queue.h" #include "vk_object.h" #include "vk_sync.h" diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 2aea36146bc..65754c4ddbe 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -44,7 +44,7 @@ #include "util/u_memory.h" #include "compiler/spirv/nir_spirv.h" -#include "vulkan/util/vk_util.h" +#include "vk_util.h" bool zink_lower_cubemap_to_array(nir_shader *s, uint32_t nonseamless_cube_mask); diff --git a/src/gallium/drivers/zink/zink_state.c b/src/gallium/drivers/zink/zink_state.c index 9b11ca58f14..4298086f6ee 100644 --- a/src/gallium/drivers/zink/zink_state.c +++ b/src/gallium/drivers/zink/zink_state.c @@ -32,7 +32,7 @@ #include "util/u_dual_blend.h" #include "util/u_memory.h" #include "util/u_helpers.h" -#include "vulkan/util/vk_format.h" +#include "vk_format.h" #include diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index ddfb2532c84..6d5169caf83 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -55,7 +55,7 @@ #include "util/u_transfer.h" #include "util/u_vertex_state_cache.h" -#include "vulkan/util/vk_util.h" +#include "vk_util.h" #include "zink_device_info.h" #include "zink_instance.h" diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 6443209fc23..362ef9c7adc 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -44,7 +44,6 @@ #include "util/format/u_format_zs.h" #include "util/ptralloc.h" #include "tgsi/tgsi_from_mesa.h" -#include "vulkan/util/vk_util.h" #include "vk_blend.h" #include "vk_cmd_enqueue_entrypoints.h" diff --git a/src/imagination/vulkan/pvr_dump_csb.c b/src/imagination/vulkan/pvr_dump_csb.c index 95e917dbaea..fb21fca9688 100644 --- a/src/imagination/vulkan/pvr_dump_csb.c +++ b/src/imagination/vulkan/pvr_dump_csb.c @@ -38,7 +38,7 @@ #include "util/list.h" #include "util/macros.h" #include "util/u_math.h" -#include "vulkan/util/vk_enum_to_str.h" +#include "vk_enum_to_str.h" /***************************************************************************** Utilities diff --git a/src/imagination/vulkan/pvr_private.h b/src/imagination/vulkan/pvr_private.h index 099ded99699..cb937cd95b7 100644 --- a/src/imagination/vulkan/pvr_private.h +++ b/src/imagination/vulkan/pvr_private.h @@ -63,6 +63,7 @@ #include "vk_buffer.h" #include "vk_command_buffer.h" #include "vk_device.h" +#include "vk_enum_to_str.h" #include "vk_graphics_state.h" #include "vk_image.h" #include "vk_instance.h" @@ -70,7 +71,6 @@ #include "vk_physical_device.h" #include "vk_queue.h" #include "vk_sync.h" -#include "vulkan/util/vk_enum_to_str.h" #include "wsi_common.h" #ifdef HAVE_VALGRIND diff --git a/src/intel/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c index 7b466a425dc..d78b5834296 100644 --- a/src/intel/vulkan/anv_pipeline_cache.c +++ b/src/intel/vulkan/anv_pipeline_cache.c @@ -29,7 +29,7 @@ #include "nir/nir_serialize.h" #include "anv_private.h" #include "nir/nir_xfb_info.h" -#include "vulkan/util/vk_util.h" +#include "vk_util.h" #include "compiler/spirv/nir_spirv.h" #include "shaders/float64_spv.h" diff --git a/src/intel/vulkan/anv_utrace.c b/src/intel/vulkan/anv_utrace.c index 1cb3e62c562..c735428cf76 100644 --- a/src/intel/vulkan/anv_utrace.c +++ b/src/intel/vulkan/anv_utrace.c @@ -29,7 +29,7 @@ #include "perf/intel_perf.h" #include "util/perf/cpu_trace.h" -#include "vulkan/runtime/vk_common_entrypoints.h" +#include "vk_common_entrypoints.h" /** Timestamp structure format */ union anv_utrace_timestamp { diff --git a/src/intel/vulkan_hasvk/anv_pipeline_cache.c b/src/intel/vulkan_hasvk/anv_pipeline_cache.c index 5b83c256c2a..4106d829426 100644 --- a/src/intel/vulkan_hasvk/anv_pipeline_cache.c +++ b/src/intel/vulkan_hasvk/anv_pipeline_cache.c @@ -29,7 +29,7 @@ #include "nir/nir_serialize.h" #include "anv_private.h" #include "nir/nir_xfb_info.h" -#include "vulkan/util/vk_util.h" +#include "vk_util.h" static bool anv_shader_bin_serialize(struct vk_pipeline_cache_object *object, diff --git a/src/nouveau/vulkan/nvk_buffer.h b/src/nouveau/vulkan/nvk_buffer.h index e7cf68f328c..d13cbc047e2 100644 --- a/src/nouveau/vulkan/nvk_buffer.h +++ b/src/nouveau/vulkan/nvk_buffer.h @@ -9,7 +9,7 @@ #include "nvk_device_memory.h" #include "nouveau_bo.h" -#include "vulkan/runtime/vk_buffer.h" +#include "vk_buffer.h" struct nvk_device_memory; struct nvk_physical_device; diff --git a/src/nouveau/vulkan/nvk_buffer_view.h b/src/nouveau/vulkan/nvk_buffer_view.h index 1f77150c8b2..964634786b3 100644 --- a/src/nouveau/vulkan/nvk_buffer_view.h +++ b/src/nouveau/vulkan/nvk_buffer_view.h @@ -7,7 +7,7 @@ #include "nvk_private.h" -#include "vulkan/runtime/vk_buffer_view.h" +#include "vk_buffer_view.h" struct nvk_physical_device; diff --git a/src/nouveau/vulkan/nvk_cmd_draw.c b/src/nouveau/vulkan/nvk_cmd_draw.c index 9c03016fef3..db56f972b14 100644 --- a/src/nouveau/vulkan/nvk_cmd_draw.c +++ b/src/nouveau/vulkan/nvk_cmd_draw.c @@ -15,9 +15,9 @@ #include "nil_format.h" #include "util/bitpack_helpers.h" -#include "vulkan/runtime/vk_render_pass.h" -#include "vulkan/runtime/vk_standard_sample_locations.h" -#include "vulkan/util/vk_format.h" +#include "vk_format.h" +#include "vk_render_pass.h" +#include "vk_standard_sample_locations.h" #include "nouveau_context.h" diff --git a/src/nouveau/vulkan/nvk_descriptor_set.h b/src/nouveau/vulkan/nvk_descriptor_set.h index 4af417a0b82..8a6c5f1ac75 100644 --- a/src/nouveau/vulkan/nvk_descriptor_set.h +++ b/src/nouveau/vulkan/nvk_descriptor_set.h @@ -9,8 +9,8 @@ #include "nouveau_bo.h" #include "nvk_device.h" -#include "vulkan/runtime/vk_object.h" -#include "vulkan/runtime/vk_descriptor_update_template.h" +#include "vk_object.h" +#include "vk_descriptor_update_template.h" struct nvk_descriptor_set_layout; diff --git a/src/nouveau/vulkan/nvk_event.h b/src/nouveau/vulkan/nvk_event.h index 245ab109a79..25f668aae95 100644 --- a/src/nouveau/vulkan/nvk_event.h +++ b/src/nouveau/vulkan/nvk_event.h @@ -7,7 +7,7 @@ #include "nvk_private.h" -#include "vulkan/runtime/vk_object.h" +#include "vk_object.h" struct nvk_event { struct vk_object_base base; diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c index 227bcd08b33..21e5f6c08fa 100644 --- a/src/nouveau/vulkan/nvk_image.c +++ b/src/nouveau/vulkan/nvk_image.c @@ -11,7 +11,7 @@ #include "nvk_physical_device.h" #include "nil_format.h" -#include "vulkan/util/vk_format.h" +#include "vk_format.h" #include "clb097.h" #include "clb197.h" diff --git a/src/nouveau/vulkan/nvk_image_view.h b/src/nouveau/vulkan/nvk_image_view.h index ffff7a1de3a..1ed3c057903 100644 --- a/src/nouveau/vulkan/nvk_image_view.h +++ b/src/nouveau/vulkan/nvk_image_view.h @@ -7,7 +7,7 @@ #include "nvk_private.h" -#include "vulkan/runtime/vk_image.h" +#include "vk_image.h" struct nvk_device; diff --git a/src/nouveau/vulkan/nvk_instance.h b/src/nouveau/vulkan/nvk_instance.h index 9cf8dcc1bcf..50b49ef9504 100644 --- a/src/nouveau/vulkan/nvk_instance.h +++ b/src/nouveau/vulkan/nvk_instance.h @@ -7,7 +7,7 @@ #include "nvk_private.h" -#include "vulkan/runtime/vk_instance.h" +#include "vk_instance.h" #include "util/xmlconfig.h" struct nvk_instance { diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index feabea94907..4a0c7c5924d 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -16,9 +16,9 @@ #include "util/disk_cache.h" #include "util/mesa-sha1.h" -#include "vulkan/runtime/vk_device.h" -#include "vulkan/runtime/vk_drm_syncobj.h" -#include "vulkan/runtime/vk_shader_module.h" +#include "vk_device.h" +#include "vk_drm_syncobj.h" +#include "vk_shader_module.h" #include "vulkan/wsi/wsi_common.h" #include diff --git a/src/nouveau/vulkan/nvk_physical_device.h b/src/nouveau/vulkan/nvk_physical_device.h index fd2a6d9d355..ac963111798 100644 --- a/src/nouveau/vulkan/nvk_physical_device.h +++ b/src/nouveau/vulkan/nvk_physical_device.h @@ -10,8 +10,8 @@ #include "nouveau_device.h" #include "nv_device_info.h" -#include "vulkan/runtime/vk_physical_device.h" -#include "vulkan/runtime/vk_sync.h" +#include "vk_physical_device.h" +#include "vk_sync.h" #include "wsi_common.h" diff --git a/src/nouveau/vulkan/nvk_sampler.h b/src/nouveau/vulkan/nvk_sampler.h index e6374eb1eae..fcbcaa9413b 100644 --- a/src/nouveau/vulkan/nvk_sampler.h +++ b/src/nouveau/vulkan/nvk_sampler.h @@ -8,10 +8,10 @@ #include "nvk_private.h" #include "nvk_physical_device.h" -#include "vulkan/runtime/vk_sampler.h" -#include "vulkan/runtime/vk_ycbcr_conversion.h" +#include "vk_sampler.h" +#include "vk_ycbcr_conversion.h" -#include "vulkan/util/vk_format.h" +#include "vk_format.h" struct nvk_sampler { struct vk_sampler vk; diff --git a/src/panfrost/vulkan/panvk_formats.c b/src/panfrost/vulkan/panvk_formats.c index 02f2ffc5a1c..0c1e8283bc7 100644 --- a/src/panfrost/vulkan/panvk_formats.c +++ b/src/panfrost/vulkan/panvk_formats.c @@ -31,7 +31,6 @@ #include "util/format_r11g11b10f.h" #include "util/format_srgb.h" #include "util/half_float.h" -#include "vulkan/util/vk_format.h" #include "vk_format.h" #include "vk_util.h" diff --git a/src/vulkan/runtime/rmv/vk_rmv_common.c b/src/vulkan/runtime/rmv/vk_rmv_common.c index 0473e8e1c37..48873d463c3 100644 --- a/src/vulkan/runtime/rmv/vk_rmv_common.c +++ b/src/vulkan/runtime/rmv/vk_rmv_common.c @@ -22,8 +22,8 @@ */ #include "vk_rmv_common.h" -#include "vulkan/runtime/vk_buffer.h" -#include "vulkan/runtime/vk_device.h" +#include "vk_buffer.h" +#include "vk_device.h" void vk_memory_trace_init(struct vk_device *device, const struct vk_rmv_device_info *device_info) diff --git a/src/vulkan/runtime/rmv/vk_rmv_exporter.c b/src/vulkan/runtime/rmv/vk_rmv_exporter.c index b2b7c264825..639becc855b 100644 --- a/src/vulkan/runtime/rmv/vk_rmv_exporter.c +++ b/src/vulkan/runtime/rmv/vk_rmv_exporter.c @@ -30,7 +30,7 @@ #include "util/format/u_format.h" #include "util/u_process.h" -#include "vulkan/util/vk_format.h" +#include "vk_format.h" static int vk_rmv_token_compare(const void *first, const void *second) diff --git a/src/vulkan/wsi/wsi_common_private.h b/src/vulkan/wsi/wsi_common_private.h index 2b36bd9526c..385c51fca9e 100644 --- a/src/vulkan/wsi/wsi_common_private.h +++ b/src/vulkan/wsi/wsi_common_private.h @@ -25,8 +25,8 @@ #include "wsi_common.h" #include "util/perf/cpu_trace.h" -#include "vulkan/runtime/vk_object.h" -#include "vulkan/runtime/vk_sync.h" +#include "vk_object.h" +#include "vk_sync.h" #ifdef __cplusplus extern "C" {