zink: always enable glsl_correct_derivatives_after_discard

this matches radeonsi behavior and eliminates the driconf handling

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27489>
This commit is contained in:
Mike Blumenkrantz
2024-02-06 08:43:13 -05:00
committed by Marge Bot
parent 63676ed502
commit fb97141131
3 changed files with 1 additions and 5 deletions
+1 -3
View File
@@ -5493,9 +5493,7 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir)
NIR_PASS_V(nir, nir_lower_frexp); /* TODO: Use the spirv instructions for this. */
if (screen->info.have_EXT_shader_demote_to_helper_invocation) {
NIR_PASS_V(nir, nir_lower_discard_or_demote,
screen->driconf.glsl_correct_derivatives_after_discard ||
nir->info.use_legacy_math_rules);
NIR_PASS_V(nir, nir_lower_discard_or_demote, true);
}
if (screen->need_2D_zs)
-1
View File
@@ -3179,7 +3179,6 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
driParseConfigFiles(config->options, config->options_info, 0, "zink",
NULL, NULL, NULL, 0, NULL, 0);
screen->driconf.dual_color_blend_by_location = driQueryOptionb(config->options, "dual_color_blend_by_location");
screen->driconf.glsl_correct_derivatives_after_discard = driQueryOptionb(config->options, "glsl_correct_derivatives_after_discard");
//screen->driconf.inline_uniforms = driQueryOptionb(config->options, "radeonsi_inline_uniforms");
screen->driconf.emulate_point_smooth = driQueryOptionb(config->options, "zink_emulate_point_smooth");
screen->driconf.zink_shader_object_enable = driQueryOptionb(config->options, "zink_shader_object_enable");
-1
View File
@@ -1530,7 +1530,6 @@ struct zink_screen {
struct {
bool dual_color_blend_by_location;
bool glsl_correct_derivatives_after_discard;
bool inline_uniforms;
bool emulate_point_smooth;
bool zink_shader_object_enable;