fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 20:10:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/format_convert: handle clamping smaller bit sizes

Browse source 
asahi will pass in 16bits, works fine if we convert before clamping. note we
don't try to be clever and make a smaller immediate because it would require
extra logic for negatives to make sure we don't have garbage in upper bits
(nir_validate checks that). do the simple, obviously correct thing.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26440>
This commit is contained in:
Alyssa Rosenzweig 2023-11-30 22:23:35 -04:00 • committed by Marge Bot
parent 33fd93f3b1
commit d7f0804a47
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/compiler/nir/nir_format_convert.h
View file

@ -24,6 +24,7 @@
#include "nir_builder.h"
#include "util/format_rgb9e5.h"
#include "util/macros.h"
static inline nir_def *
nir_shift_imm(nir_builder *b, nir_def *value, int left_shift)
@ -335,10 +336,10 @@ nir_format_clamp_uint(nir_builder *b, nir_def *f, const unsigned *bits)
nir_const_value max[NIR_MAX_VEC_COMPONENTS];
memset(max, 0, sizeof(max));
for (unsigned i = 0; i < f->num_components; i++) {
assert(bits[i] < 32);
max[i].u32 = (1 << bits[i]) - 1;
assert(bits[i] < 32 && bits[i] <= f->bit_size);
max[i].u32 = u_uintN_max(bits[i]);
}
return nir_umin(b, f, nir_build_imm(b, f->num_components, 32, max));
return nir_umin(b, f, nir_u2uN(b, nir_build_imm(b, f->num_components, 32, max), f->bit_size));
}
/* Clamps a vector of sints so they don't extend beyond the given number of
@ -354,12 +355,12 @@ nir_format_clamp_sint(nir_builder *b, nir_def *f, const unsigned *bits)
memset(min, 0, sizeof(min));
memset(max, 0, sizeof(max));
for (unsigned i = 0; i < f->num_components; i++) {
assert(bits[i] < 32);
max[i].i32 = (1 << (bits[i] - 1)) - 1;
min[i].i32 = -(1 << (bits[i] - 1));
assert(bits[i] < 32 && bits[i] <= f->bit_size);
max[i].i32 = u_intN_max(bits[i]);
min[i].i32 = u_intN_min(bits[i]);
}
f = nir_imin(b, f, nir_build_imm(b, f->num_components, 32, max));
f = nir_imax(b, f, nir_build_imm(b, f->num_components, 32, min));
f = nir_imin(b, f, nir_i2iN(b, nir_build_imm(b, f->num_components, 32, max), f->bit_size));
f = nir_imax(b, f, nir_i2iN(b, nir_build_imm(b, f->num_components, 32, min), f->bit_size));
return f;
}