fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/lower_blend: refactor logicop variables

Browse source 
This pulls out the logicop_func variable from the options struct, so we can
modify it in the next commit in a central place. It then refactors out the
format variable from the options struct since we end up duplicating
options->format[rt] a zillion times and passing in both an options struct and a
logicop func override is confusing so this will just make everything neater and
self-contained next commit.

no functional change.

Cc'd to make the next commit cherrypickable.

Cc: mesa-stable
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34426>
This commit is contained in:
Alyssa Rosenzweig 2025-04-06 18:20:33 -04:00 • committed by Marge Bot
parent 7190949927
commit 54ccc8ed0b
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/compiler/nir/nir_lower_blend.c
View file

@ -296,15 +296,11 @@ nir_logicop_func(
}
static nir_def *
nir_blend_logicop(
nir_builder *b,
const nir_lower_blend_options *options,
unsigned rt,
nir_def *src, nir_def *dst)
nir_blend_logicop(nir_builder *b,
enum pipe_format format, enum pipe_logicop func,
nir_def *src, nir_def *dst)
{
unsigned bit_size = src->bit_size;
enum pipe_format format = options->format[rt];
const struct util_format_description *format_desc =
util_format_description(format);
@ -348,7 +344,7 @@ nir_blend_logicop(
for (int i = 0; i < 4; ++i)
mask[i] = nir_const_value_for_uint(BITFIELD_MASK(bits[i]), 32);
nir_def *out = nir_logicop_func(b, options->logicop_func, src, dst,
nir_def *out = nir_logicop_func(b, func, src, dst,
nir_build_imm(b, 4, 32, mask));
if (util_format_is_unorm(format)) {
@ -528,9 +524,12 @@ nir_lower_blend_instr(nir_builder *b, nir_intrinsic_instr *store, void *data)
*/
b->cursor = nir_after_block(store->instr.block);
const enum pipe_format format = options->format[rt];
enum pipe_logicop logicop_func = options->logicop_func;
/* Don't bother copying the destination to the source for disabled RTs */
if (options->rt[rt].colormask == 0 ||
(options->logicop_enable && options->logicop_func == PIPE_LOGICOP_NOOP)) {
(options->logicop_enable && logicop_func == PIPE_LOGICOP_NOOP)) {
nir_instr_remove(&store->instr);
return true;
@ -573,10 +572,10 @@ nir_lower_blend_instr(nir_builder *b, nir_intrinsic_instr *store, void *data)
nir_def *blended = src;
if (options->logicop_enable) {
blended = nir_blend_logicop(b, options, rt, src, dst);
} else if (!util_format_is_pure_integer(options->format[rt]) &&
blended = nir_blend_logicop(b, format, logicop_func, src, dst);
} else if (!util_format_is_pure_integer(format) &&
!nir_blend_replace_rt(&options->rt[rt])) {
assert(!util_format_is_scaled(options->format[rt]));
assert(!util_format_is_scaled(format));
blended = nir_blend(b, options, rt, src, ctx->src1[rt], dst);
}
@ -584,10 +583,8 @@ nir_lower_blend_instr(nir_builder *b, nir_intrinsic_instr *store, void *data)
if (options->rt[rt].colormask != BITFIELD_MASK(4))
blended = nir_color_mask(b, options->rt[rt].colormask, blended, dst);
const unsigned num_components =
util_format_get_nr_components(options->format[rt]);
/* Shave off any components we don't want to store */
const unsigned num_components = util_format_get_nr_components(format);
blended = nir_trim_vector(b, blended, num_components);
/* Grow or shrink the store destination as needed */