From 8dc8b1361ad39feb89220944daf1a35d0f332b11 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 21 Mar 2019 14:15:43 +1000 Subject: [PATCH] softpipe: handle 32-bit bitfield inserts Fixes piglits if ARB_gpu_shader5 is enabled Reviewed-by: Brian Paul --- src/gallium/auxiliary/tgsi/tgsi_exec.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c index f66df18c7f5..5f55de0390c 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_exec.c +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c @@ -4967,10 +4967,14 @@ micro_bfi(union tgsi_exec_channel *dst, { int i; for (i = 0; i < 4; i++) { - int width = src3->u[i] & 0x1f; + int width = src3->u[i]; int offset = src2->u[i] & 0x1f; - int bitmask = ((1 << width) - 1) << offset; - dst->u[i] = ((src1->u[i] << offset) & bitmask) | (src0->u[i] & ~bitmask); + if (width == 32) { + dst->u[i] = src1->u[i]; + } else { + int bitmask = ((1 << width) - 1) << offset; + dst->u[i] = ((src1->u[i] << offset) & bitmask) | (src0->u[i] & ~bitmask); + } } } -- 2.30.2