From 7b6a5e3e244f888d6ee3618e037327f408ffb4ae Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Thu, 12 Jan 2023 16:03:20 -0800
Subject: [PATCH] zink: Fatal error if requesting validation and we fail to
 load the layer.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20756>
---
 src/gallium/drivers/zink/zink_screen.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 39deaf0b0e7..3a4e049fa25 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -2584,6 +2584,14 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
    if (!zink_create_instance(screen))
       goto fail;
 
+   if (zink_debug & ZINK_DEBUG_VALIDATION) {
+      if (!screen->instance_info.have_layer_KHRONOS_validation &&
+          !screen->instance_info.have_layer_LUNARG_standard_validation) {
+         mesa_loge("Failed to load validation layer");
+         goto fail;
+      }
+   }
+
    vk_instance_dispatch_table_load(&screen->vk.instance,
                                    screen->vk_GetInstanceProcAddr,
                                    screen->instance);