vulkan: prefer vulkan_core.h over vulkan.h

If we include vulkan.h, we risk including the WSI bits as well, which we
don't need here. Only trouble can follow from including these where
they're not needed.

So let's include vulkan_core.h in these places instead.

Fixes: b39958a3a1 ("anv,nir: Move the ANV YCbCr lowering pass to common code")
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21185>

src/vulkan/overlay-layer/overlay.cpp

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <vulkan/vk_layer.h>
 
 #include "git_sha1.h"

src/vulkan/runtime/vk_descriptors.h

@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 VkResult
 vk_create_sorted_bindings(const VkDescriptorSetLayoutBinding *bindings, unsigned count,

src/vulkan/runtime/vk_format_info_gen.py

@@ -36,7 +36,7 @@ TEMPLATE_H = Template(COPYRIGHT + """\
 #ifndef VK_FORMAT_INFO_H
 #define VK_FORMAT_INFO_H
 
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 #ifdef __cplusplus
 extern "C" {

src/vulkan/runtime/vk_object.h

@@ -23,7 +23,7 @@
 #ifndef VK_OBJECT_H
 #define VK_OBJECT_H
 
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include <vulkan/vk_icd.h>
 
 #include "c11/threads.h"

src/vulkan/runtime/vk_shader_module.h

@@ -24,7 +24,7 @@
 #ifndef VK_SHADER_MODULE_H
 #define VK_SHADER_MODULE_H
 
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 #include "compiler/shader_enums.h"
 #include "vk_object.h"

src/vulkan/util/gen_enum_to_str.py

@@ -58,7 +58,7 @@ C_TEMPLATE = Template(textwrap.dedent(u"""\
      */
 
     #include <string.h>
-    #include <vulkan/vulkan.h>
+    #include <vulkan/vulkan_core.h>
     #include <vulkan/vk_android_native_buffer.h>
     #include <vulkan/vk_layer.h>
     #include "util/macros.h"
@@ -169,7 +169,7 @@ H_DEFINE_TEMPLATE = Template(textwrap.dedent(u"""\
     #ifndef MESA_VK_ENUM_DEFINES_H
     #define MESA_VK_ENUM_DEFINES_H
 
-    #include <vulkan/vulkan.h>
+    #include <vulkan/vulkan_core.h>
     #include <vulkan/vk_android_native_buffer.h>
 
     #ifdef __cplusplus

src/vulkan/util/rmv/vk_rmv_common.h

@@ -29,7 +29,7 @@
 #include "util/simple_mtx.h"
 #include "util/u_debug.h"
 #include "util/u_dynarray.h"
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 #include "vk_rmv_tokens.h"
 
 struct vk_memory_trace_data;

src/vulkan/util/rmv/vk_rmv_tokens.h

@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "util/os_time.h"
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 /*
  * Implemented types of tokens.

src/vulkan/util/vk_alloc.h

@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 #include "util/u_math.h"
 #include "util/macros.h"

src/vulkan/util/vk_cmd_queue_gen.py

@@ -67,7 +67,7 @@ TEMPLATE_H = Template(COPYRIGHT + """\
 #include "util/list.h"
 
 #define VK_PROTOTYPES
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -189,7 +189,7 @@ TEMPLATE_C = Template(COPYRIGHT + """
 #include "${header}"
 
 #define VK_PROTOTYPES
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 #include "vk_alloc.h"
 #include "vk_cmd_enqueue_entrypoints.h"

src/vulkan/util/vk_util.h

@@ -35,7 +35,7 @@ extern "C" {
 
 /* common inlines and macros for vulkan drivers */
 
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan_core.h>
 
 struct vk_pnext_iterator {
    VkBaseOutStructure *pos;