Revert "meson/vulkan/util: allow venus to drop compiler deps"

This reverts commit 3923d43908.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@google.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26574>

src/vulkan/runtime/meson.build

@@ -123,14 +123,11 @@ vulkan_runtime_files = files(
 vulkan_runtime_deps = [
   vulkan_wsi_deps,
   idep_mesautil,
-  idep_nir_headers,
+  idep_nir,
+  idep_vtn,
   idep_vulkan_util,
 ]
 
-if with_vk_compiler
-  vulkan_runtime_deps += [idep_nir, idep_vtn]
-endif
-
 if dep_libdrm.found()
   vulkan_runtime_files += files('vk_drm_syncobj.c', 'vk_drm_syncobj.h')
   vulkan_runtime_deps += dep_libdrm

src/vulkan/runtime/vk_instance.c

@@ -34,6 +34,8 @@
 #include "vk_debug_utils.h"
 #include "vk_physical_device.h"
 
+#include "compiler/glsl_types.h"
+
 #define VERSION_IS_1_0(version) \
    (VK_API_VERSION_MAJOR(version) == 1 && VK_API_VERSION_MINOR(version) == 0)
 
@@ -199,7 +201,7 @@ vk_instance_init(struct vk_instance *instance,
    instance->trace_frame = (uint32_t)debug_get_num_option("MESA_VK_TRACE_FRAME", 0xFFFFFFFF);
    instance->trace_trigger_file = secure_getenv("MESA_VK_TRACE_TRIGGER");
 
-   vk_compiler_cache_init();
+   glsl_type_singleton_init_or_ref();
 
    return VK_SUCCESS;
 }
@@ -219,7 +221,7 @@ vk_instance_finish(struct vk_instance *instance)
 {
    destroy_physical_devices(instance);
 
-   vk_compiler_cache_finish();
+   glsl_type_singleton_decref();
    if (unlikely(!list_is_empty(&instance->debug_utils.callbacks))) {
       list_for_each_entry_safe(struct vk_debug_utils_messenger, messenger,
                                &instance->debug_utils.callbacks, link) {