diff options
author | Dave Airlie <[email protected]> | 2019-03-21 14:13:48 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2019-03-22 09:30:21 +1000 |
commit | 7b7cb1bc35cf9ec5d0acb9dd6ea8d7da95c962cb (patch) | |
tree | 5375908e2539d6dc994cbc2645d873ec96304386 /src/gallium/auxiliary/tgsi | |
parent | a1bd9dd5bcd6e4aa9a5cf33d9901046f68d3d580 (diff) |
softpipe: fix 32-bit bitfield extract
These didn't deal with the width == 32 case that TGSI is defined with.
Fixes piglit tests if ARB_gpu_shader5 is enabled.
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/tgsi')
-rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_exec.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c index 99edf33c22e..f66df18c7f5 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_exec.c +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c @@ -4912,8 +4912,13 @@ micro_ibfe(union tgsi_exec_channel *dst, { int i; for (i = 0; i < 4; i++) { - int width = src2->i[i] & 0x1f; + int width = src2->i[i]; int offset = src1->i[i] & 0x1f; + if (width == 32 && offset == 0) { + dst->i[i] = src0->i[i]; + continue; + } + width &= 0x1f; if (width == 0) dst->i[i] = 0; else if (width + offset < 32) @@ -4934,8 +4939,13 @@ micro_ubfe(union tgsi_exec_channel *dst, { int i; for (i = 0; i < 4; i++) { - int width = src2->u[i] & 0x1f; + int width = src2->u[i]; int offset = src1->u[i] & 0x1f; + if (width == 32 && offset == 0) { + dst->u[i] = src0->u[i]; + continue; + } + width &= 0x1f; if (width == 0) dst->u[i] = 0; else if (width + offset < 32) |