From 198719de39fa9daa7d254c4be44a8e4caf30ae1c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 11 Aug 2023 14:40:22 -0400 Subject: [PATCH] zink: fix null config screen creation Fixes: 6d60115be7c ("zink: Fix enumerate devices when running compositor") Part-of: --- src/gallium/drivers/zink/zink_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index a74ad86..8564d85 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2886,7 +2886,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config) screen->driconf.zink_shader_object_enable = driQueryOptionb(config->options, "zink_shader_object_enable"); } - if (!zink_create_instance(screen, config->dev_major > 0 && config->dev_major < 255)) + if (!zink_create_instance(screen, config && config->dev_major > 0 && config->dev_major < 255)) goto fail; if (zink_debug & ZINK_DEBUG_VALIDATION) { @@ -2910,7 +2910,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config) (zink_debug & ZINK_DEBUG_VALIDATION) && !create_debug(screen)) debug_printf("ZINK: failed to setup debug utils\n"); - choose_pdev(screen, config->dev_major, config->dev_minor); + choose_pdev(screen, config ? config->dev_major : 0, config ? config->dev_minor : 0); if (screen->pdev == VK_NULL_HANDLE) { mesa_loge("ZINK: failed to choose pdev"); goto fail; -- 2.7.4