From d52328fc398aae4c3582172516b0ad98f0677b58 Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Tue, 25 Nov 2014 00:38:10 +0100 Subject: [PATCH] st/nine: Fix setting of the shift modifier in nine_shader It is an sint_4, but it was stored in a uint_8... The code using it was acting as if it was signed. Problem found thanks to Coverity Cc: "10.4" Tested-by: David Heidelberg Reviewed-by: Ilia Mirkin Signed-off-by: Axel Davy --- src/gallium/state_trackers/nine/nine_shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/nine/nine_shader.c b/src/gallium/state_trackers/nine/nine_shader.c index 268612eea05..4f78f6e933b 100644 --- a/src/gallium/state_trackers/nine/nine_shader.c +++ b/src/gallium/state_trackers/nine/nine_shader.c @@ -239,7 +239,7 @@ struct sm1_dst_param BYTE file; BYTE mask; BYTE mod; - BYTE shift; /* sint4 */ + int8_t shift; /* sint4 */ BYTE type; }; @@ -2527,6 +2527,7 @@ sm1_parse_get_param(struct shader_translator *tx, DWORD *reg, DWORD *rel) static void sm1_parse_dst_param(struct sm1_dst_param *dst, DWORD tok) { + uint8_t shift; dst->file = (tok & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT | (tok & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2; @@ -2535,7 +2536,8 @@ sm1_parse_dst_param(struct sm1_dst_param *dst, DWORD tok) dst->rel = NULL; dst->mask = (tok & NINED3DSP_WRITEMASK_MASK) >> NINED3DSP_WRITEMASK_SHIFT; dst->mod = (tok & D3DSP_DSTMOD_MASK) >> D3DSP_DSTMOD_SHIFT; - dst->shift = (tok & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT; + shift = (tok & D3DSP_DSTSHIFT_MASK) >> D3DSP_DSTSHIFT_SHIFT; + dst->shift = (shift & 0x8) ? -(shift & 0x7) : shift & 0x7; } static void -- 2.30.2