diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2016-09-01 21:36:59 -0700 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2016-09-14 14:50:55 -0700 |
| commit | 32d67923b28e55cfe23883510509644e788003f0 (patch) | |
| tree | 05d27e368ca658c19583039fb2f9fd7adedf9ea4 /src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp | |
| parent | 5cc6425d708a9b8c660c2f43f5e277c507c98bf0 (diff) | |
| download | external_mesa3d-32d67923b28e55cfe23883510509644e788003f0.zip external_mesa3d-32d67923b28e55cfe23883510509644e788003f0.tar.gz external_mesa3d-32d67923b28e55cfe23883510509644e788003f0.tar.bz2 | |
i965/fs: Fix LOAD_PAYLOAD handling in register coalesce is_nop_mov().
is_nop_mov() was broken for LOAD_PAYLOAD instructions in two ways: On
the one hand the original destination register offset wasn't being
taken into account which would give incorrect results if it was
already non-zero, and on the other hand all source registers were
being treated as if they had a size of 32B, which is almost never the
case in SIMD16 programs for non-header sources.
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp index 310e801..694cc0b 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp @@ -50,10 +50,12 @@ is_nop_mov(const fs_inst *inst) if (inst->opcode == SHADER_OPCODE_LOAD_PAYLOAD) { fs_reg dst = inst->dst; for (int i = 0; i < inst->sources; i++) { - dst.offset = i * REG_SIZE + dst.offset % REG_SIZE; if (!dst.equals(inst->src[i])) { return false; } + dst.offset += (i < inst->header_size ? REG_SIZE : + inst->exec_size * dst.stride * + type_sz(inst->src[i].type)); } return true; } else if (inst->opcode == BRW_OPCODE_MOV) { |