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

Merge branch 'fix_32bit_math' into 'main'

Browse source 
util: Don't force 64-bit division on 32-bit platforms

See merge request mesa/mesa!39001
This commit is contained in:
Micah Shennum 2025-12-19 18:49:05 -06:00
commit 240d128888
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/util/format/format_utils.h
View file

@ -36,7 +36,7 @@
/* Extends an integer of size SRC_BITS to one of size DST_BITS linearly */ /* Extends an integer of size SRC_BITS to one of size DST_BITS linearly */
#define EXTEND_NORMALIZED_INT(X, SRC_BITS, DST_BITS) \ #define EXTEND_NORMALIZED_INT(X, SRC_BITS, DST_BITS) \
(((X) * (int)(u_uintN_max(DST_BITS) / u_uintN_max(SRC_BITS))) + \ (((X) * (int)((unsigned)u_uintN_max(DST_BITS) / (unsigned)u_uintN_max(SRC_BITS))) + \
(((DST_BITS) % (SRC_BITS)) ? ((X) >> ((SRC_BITS) - (DST_BITS) % (SRC_BITS))) : 0)) (((DST_BITS) % (SRC_BITS)) ? ((X) >> ((SRC_BITS) - (DST_BITS) % (SRC_BITS))) : 0))
static inline float static inline float
@ -87,16 +87,18 @@ static inline unsigned
_mesa_unorm_to_unorm(unsigned x, unsigned src_bits, unsigned dst_bits) _mesa_unorm_to_unorm(unsigned x, unsigned src_bits, unsigned dst_bits)
{ {
if (src_bits < dst_bits) { if (src_bits < dst_bits) {
assert((src_bits <= sizeof(unsigned) * 8) && (dst_bits <= sizeof(unsigned) * 8));
return EXTEND_NORMALIZED_INT(x, src_bits, dst_bits); return EXTEND_NORMALIZED_INT(x, src_bits, dst_bits);
} else if (src_bits > dst_bits) { } else if (src_bits > dst_bits) {
unsigned src_half = (1u << (src_bits - 1)) - 1; unsigned src_half = (1u << (src_bits - 1)) - 1;
unsigned max_dst = (unsigned)u_uintN_max(dst_bits);
unsigned max_src = (unsigned)u_uintN_max(src_bits);
if (src_bits + dst_bits > sizeof(x) * 8) { if (src_bits + dst_bits > sizeof(x) * 8) {
assert(src_bits + dst_bits <= sizeof(uint64_t) * 8); assert(src_bits + dst_bits <= sizeof(uint64_t) * 8);
return (((uint64_t) x * u_uintN_max(dst_bits) + src_half) / return ((uint64_t) x * max_dst + src_half) / max_src;
u_uintN_max(src_bits));
} else { } else {
return (x * u_uintN_max(dst_bits) + src_half) / u_uintN_max(src_bits); return (x * max_dst + src_half) / max_src;
} }
} else { } else {
return x; return x;
@ -140,9 +142,10 @@ _mesa_snorm_to_snorm(int x, unsigned src_bits, unsigned dst_bits)
{ {
if (x < -u_intN_max(src_bits)) if (x < -u_intN_max(src_bits))
return -u_intN_max(dst_bits); return -u_intN_max(dst_bits);
else if (src_bits < dst_bits) else if (src_bits < dst_bits){
assert((src_bits <= sizeof(unsigned) * 8) && (dst_bits <= sizeof(unsigned) * 8));
return EXTEND_NORMALIZED_INT(x, src_bits - 1, dst_bits - 1); return EXTEND_NORMALIZED_INT(x, src_bits - 1, dst_bits - 1);
else } else
return x >> (src_bits - dst_bits); return x >> (src_bits - dst_bits);
} }