From: Lucas Stach Date: Fri, 22 Sep 2017 09:24:08 +0000 (+0200) Subject: etnaviv: fix 16bpp clears X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e9d37d68cff2ac871d8e32a947173898683c0af3;p=mesa.git etnaviv: fix 16bpp clears util_pack_color may leave undefined values in the upper half of the packed integer. As our hardware needs the upper 16 bits to mirror the lower 16bits, this breaks clears of those formats if the undefined values aren't masked off. I've only observed the issue with R5G6B5_UNORM surfaces, other 16bpp formats seem to work fine. Fixes: d6aa2ba2b2 (etnaviv: replace translate_clear_color with util_pack_color) Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Lucas Stach Reviewed-by: Wladimir J. van der Laan Reviewed-by: Christian Gmeiner --- diff --git a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c index 92c91073434..d73d0e30b3e 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c +++ b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c @@ -106,7 +106,7 @@ pack_rgba(enum pipe_format format, const float *rgba) union util_color uc; util_pack_color(rgba, format, &uc); if (util_format_get_blocksize(format) == 2) - return uc.ui[0] << 16 | uc.ui[0]; + return uc.ui[0] << 16 | (uc.ui[0] & 0xffff); else return uc.ui[0]; }