From 41a3213dca16536688382ea723a44866076d107c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 8 May 2026 11:55:13 -0400 Subject: [PATCH] zink: remove remaining maint5 checks this is required now Part-of: --- src/gallium/drivers/zink/zink_compiler.c | 2 +- src/gallium/drivers/zink/zink_screen.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index c2bb7450e21..d16cd164541 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -3029,7 +3029,7 @@ zink_compiler_assign_io(struct zink_screen *screen, nir_shader *producer, nir_sh bool can_remove = false; if (!nir_find_variable_with_location(consumer, nir_var_shader_in, VARYING_SLOT_PSIZ)) { /* maintenance5 guarantees "A default size of 1.0 is used if PointSize is not written" */ - if (screen->info.have_KHR_maintenance5 && !var->data.explicit_xfb_buffer && delete_psiz_store(producer, true)) + if (!var->data.explicit_xfb_buffer && delete_psiz_store(producer, true)) can_remove = !(producer->info.outputs_written & VARYING_BIT_PSIZ); else if (consumer->info.stage != MESA_SHADER_FRAGMENT) can_remove = !var->data.explicit_location; diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 9084c911b38..42efca3705b 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1133,9 +1133,7 @@ zink_init_screen_caps(struct zink_screen *screen) caps->viewport_transform_lowered = true; - caps->point_size_fixed = - screen->info.have_KHR_maintenance5 ? - PIPE_POINT_SIZE_LOWER_USER_ONLY : PIPE_POINT_SIZE_LOWER_ALWAYS; + caps->point_size_fixed = PIPE_POINT_SIZE_LOWER_USER_ONLY; caps->flatshade = false; caps->alpha_test = false; caps->clip_planes = 0; @@ -2970,8 +2968,6 @@ init_driver_workarounds(struct zink_screen *screen) /* performance */ screen->info.border_color_feats.customBorderColorWithoutFormat = VK_FALSE; } - if (!screen->info.have_KHR_maintenance5) - screen->driver_workarounds.missing_a8_unorm = true; if ((!screen->info.have_EXT_line_rasterization || !screen->info.line_rast_feats.stippledBresenhamLines) && @@ -3251,7 +3247,6 @@ init_optimal_keys(struct zink_screen *screen) screen->info.have_EXT_graphics_pipeline_library = false; if (!screen->optimal_keys || - !screen->info.have_KHR_maintenance5 || /* 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;