From 9172127057e83286304afe68ec1a546c28b79ce3 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 19 Jul 2022 10:02:46 -0400 Subject: [PATCH] zink: delete ZINK_DESCRIPTOR_MODE_NOFALLBACK this was useful for testing but is going to be less useful soon Reviewed-by: Dave Airlie Part-of: --- docs/drivers/zink.rst | 2 -- src/gallium/drivers/zink/zink_descriptors.c | 2 +- src/gallium/drivers/zink/zink_screen.c | 1 - src/gallium/drivers/zink/zink_screen.h | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/drivers/zink.rst b/docs/drivers/zink.rst index bd82ca4b017..8cb2277ee23 100644 --- a/docs/drivers/zink.rst +++ b/docs/drivers/zink.rst @@ -253,8 +253,6 @@ changing the descriptor manager may improve performance: Automatically detect best mode. This is the default. ``lazy`` Disable caching and attempt to use the least amount of CPU. -``nofallback`` - Always use caching to try reducing GPU churn. ``notemplates`` The same as `auto`, but disables the use of `VK_KHR_descriptor_templates`. diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 59aab2ad28c..5570b1d0d12 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -1526,7 +1526,7 @@ zink_descriptors_update(struct zink_context *ctx, bool is_compute) zds = zink_descriptor_set_get(ctx, h, is_compute, &cache_hit); if (cache_hit) { pdd_cached(pg)->cache_misses[h] = 0; - } else if (likely(zink_descriptor_mode != ZINK_DESCRIPTOR_MODE_NOFALLBACK)) { + } else { if (++pdd_cached(pg)->cache_misses[h] == MAX_CACHE_MISSES) { #ifdef PRINT_DEBUG const char *set_names[] = { diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 57a5651375e..96942d9cc15 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -91,7 +91,6 @@ static const struct debug_named_value zink_descriptor_options[] = { { "auto", ZINK_DESCRIPTOR_MODE_AUTO, "Automatically detect best mode" }, { "lazy", ZINK_DESCRIPTOR_MODE_LAZY, "Don't cache, do least amount of updates" }, - { "nofallback", ZINK_DESCRIPTOR_MODE_NOFALLBACK, "Cache, never use lazy fallback" }, { "notemplates", ZINK_DESCRIPTOR_MODE_NOTEMPLATES, "Cache, but disable templated updates" }, DEBUG_NAMED_VALUE_END }; diff --git a/src/gallium/drivers/zink/zink_screen.h b/src/gallium/drivers/zink/zink_screen.h index 3475bfd6215..bc176be4dfa 100644 --- a/src/gallium/drivers/zink/zink_screen.h +++ b/src/gallium/drivers/zink/zink_screen.h @@ -77,7 +77,6 @@ enum zink_descriptor_type; enum zink_descriptor_mode { ZINK_DESCRIPTOR_MODE_AUTO, ZINK_DESCRIPTOR_MODE_LAZY, - ZINK_DESCRIPTOR_MODE_NOFALLBACK, ZINK_DESCRIPTOR_MODE_NOTEMPLATES, ZINK_DESCRIPTOR_MODE_COMPACT, };