From 4735265187b020c2c59b7eaee1db270ef4d82370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= Date: Tue, 9 Apr 2024 20:55:53 +0200 Subject: [PATCH] r300: get rid of the unused ubo_vec4_max ntr option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We now do the lowering in finalize_nir. Signed-off-by: Pavel Ondračka Part-of: --- src/gallium/drivers/r300/compiler/nir_to_rc.h | 1 - src/gallium/drivers/r300/r300_state.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/gallium/drivers/r300/compiler/nir_to_rc.h b/src/gallium/drivers/r300/compiler/nir_to_rc.h index 495d6ee79c6..d69fa39439c 100644 --- a/src/gallium/drivers/r300/compiler/nir_to_rc.h +++ b/src/gallium/drivers/r300/compiler/nir_to_rc.h @@ -18,7 +18,6 @@ struct nir_to_rc_options { /* Emit MAX(a,-a) instead of abs src modifier) */ bool lower_fabs; bool lower_ssbo_bindings; - uint32_t ubo_vec4_max; }; const void *nir_to_rc(struct nir_shader *s, diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index d9ac852c7b4..82f175dcbfd 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -1925,11 +1925,8 @@ static void* r300_create_vs_state(struct pipe_context* pipe, static const struct nir_to_rc_options hwtcl_r300_options = { .lower_cmp = true, .lower_fabs = true, - .ubo_vec4_max = 0x00ff, - }; - static const struct nir_to_rc_options hwtcl_r500_options = { - .ubo_vec4_max = 0x00ff, }; + static const struct nir_to_rc_options hwtcl_r500_options = {0}; const struct nir_to_rc_options *ntr_options; if (r300->screen->caps.has_tcl) { if (r300->screen->caps.is_r500) {