From 02bf3e3c0a6eddef27ed9f7ad093a6d5b4d11d41 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 4 May 2023 09:49:23 -0400 Subject: [PATCH] zink: enable EXT_shader_object globally with have_EXT_attachment_feedback_loop_dynamic_state this leaves fbfetch as the lone case where it can't yet be used Part-of: --- src/gallium/drivers/zink/zink_screen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index f15e323d662..27eb32145a3 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -2662,8 +2662,9 @@ init_optimal_keys(struct zink_screen *screen) if (!screen->optimal_keys) screen->info.have_EXT_graphics_pipeline_library = false; - /* EXT_shader_object can't yet be used for feedback loop, so this must be per-app enabled */ - if (!screen->driconf.zink_shader_object_enable || !screen->optimal_keys) + if (!screen->optimal_keys || + /* EXT_shader_object needs either dynamic feedback loop or per-app enablement */ + (!screen->driconf.zink_shader_object_enable && !screen->info.have_EXT_attachment_feedback_loop_dynamic_state)) screen->info.have_EXT_shader_object = false; if (screen->info.have_EXT_shader_object) screen->have_full_ds3 = true;