fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

zink: fix null config screen creation

Browse source 
Fixes: 6d60115be7 ("zink: Fix enumerate devices when running compositor")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24641>
This commit is contained in:
Mike Blumenkrantz 2023-08-11 14:40:22 -04:00 • committed by Marge Bot
parent e1c278ae82
commit 198719de39
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/zink/zink_screen.c
View file

@ -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;