fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-05 01:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: remove commutative_blend_add option

Browse source 
This is unused.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16139>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2022-03-16 10:36:38 +01:00 • committed by Marge Bot
parent 819dd2f27a
commit c9a73f53e8
5 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/radeonsi/driinfo_radeonsi.h
View file

@ -2,7 +2,6 @@
DRI_CONF_SECTION_PERFORMANCE
DRI_CONF_ADAPTIVE_SYNC(true)
DRI_CONF_RADEONSI_ASSUME_NO_Z_FIGHTS(false)
DRI_CONF_RADEONSI_COMMUTATIVE_BLEND_ADD(false)
DRI_CONF_RADEONSI_ZERO_ALL_VRAM_ALLOCS(false)
DRI_CONF_SECTION_END

3
src/gallium/drivers/radeonsi/si_pipe.c
View file

@ -1269,9 +1269,6 @@ static struct pipe_screen *radeonsi_screen_create_impl(struct radeon_winsys *ws,
sscreen->info.has_out_of_order_rast && !(sscreen->debug_flags & DBG(NO_OUT_OF_ORDER));
sscreen->assume_no_z_fights = driQueryOptionb(config->options, "radeonsi_assume_no_z_fights") ||
driQueryOptionb(config->options, "allow_draw_out_of_order");
sscreen->commutative_blend_add =
driQueryOptionb(config->options, "radeonsi_commutative_blend_add") ||
driQueryOptionb(config->options, "allow_draw_out_of_order");
sscreen->allow_draw_out_of_order = driQueryOptionb(config->options, "allow_draw_out_of_order");
sscreen->use_ngg = !(sscreen->debug_flags & DBG(NO_NGG)) &&

1
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -567,7 +567,6 @@ struct si_screen {
bool has_draw_indirect_multi;
bool has_out_of_order_rast;
bool assume_no_z_fights;
bool commutative_blend_add;
bool allow_draw_out_of_order;
bool dpbb_allowed;
bool use_ngg;

17
src/gallium/drivers/radeonsi/si_state.c
View file

@ -395,20 +395,9 @@ static void si_blend_check_commutativity(struct si_screen *sscreen, struct si_st
(1u << PIPE_BLENDFACTOR_INV_CONST_ALPHA) | (1u << PIPE_BLENDFACTOR_INV_SRC1_COLOR) |
(1u << PIPE_BLENDFACTOR_INV_SRC1_ALPHA);
if (dst == PIPE_BLENDFACTOR_ONE && (src_allowed & (1u << src))) {
/* Addition is commutative, but floating point addition isn't
* associative: subtle changes can be introduced via different
* rounding.
*
* Out-of-order is also non-deterministic, which means that
* this breaks OpenGL invariance requirements. So only enable
* out-of-order additive blending if explicitly allowed by a
* setting.
*/
if (func == PIPE_BLEND_MAX || func == PIPE_BLEND_MIN ||
(func == PIPE_BLEND_ADD && sscreen->commutative_blend_add))
blend->commutative_4bit |= chanmask;
}
if (dst == PIPE_BLENDFACTOR_ONE && (src_allowed & (1u << src)) &&
(func == PIPE_BLEND_MAX || func == PIPE_BLEND_MIN))
blend->commutative_4bit |= chanmask;
}
/**

4
src/util/driconf.h
View file

@ -476,10 +476,6 @@
DRI_CONF_OPT_B(radeonsi_assume_no_z_fights, def, \
"Assume no Z fights (enables aggressive out-of-order rasterization to improve performance; may cause rendering errors)")
#define DRI_CONF_RADEONSI_COMMUTATIVE_BLEND_ADD(def) \
DRI_CONF_OPT_B(radeonsi_commutative_blend_add, def, \
"Commutative additive blending optimizations (may cause rendering errors)")
#define DRI_CONF_RADEONSI_ZERO_ALL_VRAM_ALLOCS(def) \
DRI_CONF_OPT_B(radeonsi_zerovram, def, \
"Zero all vram allocations")