From fc6bb139456afb1f20be8b6f59e78f7f065a00f1 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 9 Nov 2022 14:07:27 -0500 Subject: [PATCH] zink: Don't check WITH_XMLCONFIG It's not necessary -- no other driver does this despite most drivers having a driconf check like Zink does -- and it adds a problematic cross-tree dependency. This was been a relic from when xmlconfig didn't work at all on Windows, added in commit 834b69d1ef4 ("zink: fix win32 build"). That has been replaced the "static" xmlconfig only, which is good for almost everyone enough in practice. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Jesse Natalie Reviewed-by: Eric Engestrom Reviewed-by: Erik Faye-Lund Reviewed-by: Emma Anholt Part-of: --- src/gallium/drivers/zink/zink_screen.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 05ebc73c41160..b0182224800e7 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2445,7 +2445,6 @@ zink_internal_create_screen(const struct pipe_screen_config *config) goto fail; screen->instance_info.loader_version = zink_get_loader_version(screen); -#if WITH_XMLCONFIG if (config) { driParseConfigFiles(config->options, config->options_info, 0, "zink", NULL, NULL, NULL, 0, NULL, 0); @@ -2454,7 +2453,6 @@ zink_internal_create_screen(const struct pipe_screen_config *config) //screen->driconf.inline_uniforms = driQueryOptionb(config->options, "radeonsi_inline_uniforms"); screen->instance_info.disable_xcb_surface = driQueryOptionb(config->options, "disable_xcb_surface"); } -#endif if (!zink_create_instance(screen)) goto fail;