Module: Mesa Branch: staging/23.2 Commit: af25afc9d65b8dc416cda8466a9280358a87b338 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=af25afc9d65b8dc416cda8466a9280358a87b338
Author: Mike Blumenkrantz <[email protected]> Date: Mon Jul 10 14:29:36 2023 -0400 zink: don't clobber descriptor mode on multiple screen creation the env var should only ever be read if the mode is unset cc: mesa-stable Reviewed-by: Adam Jackson <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24075> (cherry picked from commit 626e3a6e34d72fd08c4d7c882bdbcfc25b9133f0) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 387888c9cc4..8c9544679dc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -22924,7 +22924,7 @@ "description": "zink: don't clobber descriptor mode on multiple screen creation", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index b5cdf13710b..7c7e4e6bdf0 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2800,7 +2800,8 @@ zink_internal_create_screen(const struct pipe_screen_config *config) } zink_debug = debug_get_option_zink_debug(); - zink_descriptor_mode = debug_get_option_zink_descriptor_mode(); + if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_AUTO) + zink_descriptor_mode = debug_get_option_zink_descriptor_mode(); screen->threaded = util_get_cpu_caps()->nr_cpus > 1 && debug_get_bool_option("GALLIUM_THREAD", util_get_cpu_caps()->nr_cpus > 1); if (zink_debug & ZINK_DEBUG_FLUSHSYNC)
