Module: Mesa Branch: master Commit: 2ac171a7db4e4ad2fa902e62bf18bc1f67e91643 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ac171a7db4e4ad2fa902e62bf18bc1f67e91643
Author: Oded Gabbay <[email protected]> Date: Tue Aug 4 21:39:32 2015 +0300 mesa: clear existing swizzle info before bitwise-OR This patch fixes a bug in big-endian treatment, where the previous swizzle info wasn't cleared before a new swizzle info was inserted into the format field using a bitwise-OR operation. v2: use MESA_ARRAY_FORMAT_SWIZZLE_*_MASK instead of numeric constants v3: align according to coding style Signed-off-by: Oded Gabbay <[email protected]> CC: "10.5 10.6" <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> --- src/mesa/main/formats.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h index 7e451ca..d938e6a 100644 --- a/src/mesa/main/formats.h +++ b/src/mesa/main/formats.h @@ -191,6 +191,11 @@ static inline void _mesa_array_format_set_swizzle(mesa_array_format *f, int32_t x, int32_t y, int32_t z, int32_t w) { + *f &= ~(MESA_ARRAY_FORMAT_SWIZZLE_X_MASK | + MESA_ARRAY_FORMAT_SWIZZLE_Y_MASK | + MESA_ARRAY_FORMAT_SWIZZLE_Z_MASK | + MESA_ARRAY_FORMAT_SWIZZLE_W_MASK); + *f |= ((x << 8 ) & MESA_ARRAY_FORMAT_SWIZZLE_X_MASK) | ((y << 11) & MESA_ARRAY_FORMAT_SWIZZLE_Y_MASK) | ((z << 14) & MESA_ARRAY_FORMAT_SWIZZLE_Z_MASK) | _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
