From 9901aeb1c74648cbe1aa1d18d590a689c844cbad Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sun, 9 Aug 2015 22:03:00 -0700 Subject: [PATCH] mesa/format_utils: Add src_bits == dst_bits cases to unorm_to_unorm This better ensures that the src_bits == dst_bits case gets optimized away. Reviewed-by: Neil Roberts Reviewed-by: Roland Scheidegger --- src/mesa/main/format_utils.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/format_utils.h b/src/mesa/main/format_utils.h index 00ec7774dd2..618f43d0aaa 100644 --- a/src/mesa/main/format_utils.h +++ b/src/mesa/main/format_utils.h @@ -99,7 +99,7 @@ _mesa_unorm_to_unorm(unsigned x, unsigned src_bits, unsigned dst_bits) { if (src_bits < dst_bits) { return EXTEND_NORMALIZED_INT(x, src_bits, dst_bits); - } else { + } else if (src_bits > dst_bits) { unsigned src_half = (1 << (src_bits - 1)) - 1; if (src_bits + dst_bits > sizeof(x) * 8) { @@ -109,6 +109,8 @@ _mesa_unorm_to_unorm(unsigned x, unsigned src_bits, unsigned dst_bits) } else { return (x * MAX_UINT(dst_bits) + src_half) / MAX_UINT(src_bits); } + } else { + return x; } } -- 2.30.2