diff options
author | Samuel Iglesias Gonsálvez <[email protected]> | 2017-04-25 12:28:18 +0200 |
---|---|---|
committer | Andres Gomez <[email protected]> | 2017-05-12 21:54:55 +0300 |
commit | 23833ed201a74210d92697424e672b800d1ad539 (patch) | |
tree | 9b56666e5f33b3dda92511e21291e1e18e24d7ef /src/mesa | |
parent | 0b9d7ea7a3d941af048f97f85514643b02b4b43f (diff) |
i965/vec4: don't modify regioning parameters to the sources of DF align1 instructions
The regioning parameters are now properly set by convert_to_hw_regs()
and we don't need to fix them in the generator. That latter fix
previously done in the generator was strictly speaking wrong for any
non-identity regions.
Signed-off-by: Samuel Iglesias Gonsálvez <[email protected]>
Cc: "17.1" <[email protected]>
Reviewed-by: Francisco Jerez <[email protected]>
(cherry picked from commit f57e234fdd52331d0aa6656a36efdebea9d11e9d)
[Andres Gomez: resolve trivial conflicts]
Signed-off-by: Andres Gomez <[email protected]>
Conflicts:
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_generator.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp index f095cc2d0f2..81047952cb0 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp @@ -1937,8 +1937,6 @@ generate_code(struct brw_codegen *p, dst.hstride = BRW_HORIZONTAL_STRIDE_2; dst.width = BRW_WIDTH_4; - src[0].vstride = BRW_VERTICAL_STRIDE_4; - src[0].width = BRW_WIDTH_4; brw_MOV(p, dst, src[0]); struct brw_reg dst_as_src = dst; @@ -1989,9 +1987,7 @@ generate_code(struct brw_codegen *p, src[0] = retype(src[0], BRW_REGISTER_TYPE_UD); if (inst->opcode == VEC4_OPCODE_PICK_HIGH_32BIT) src[0] = suboffset(src[0], 1); - src[0].vstride = BRW_VERTICAL_STRIDE_8; - src[0].width = BRW_WIDTH_4; - src[0].hstride = BRW_HORIZONTAL_STRIDE_2; + src[0] = spread(src[0], 2); brw_MOV(p, dst, src[0]); brw_set_default_access_mode(p, BRW_ALIGN_16); @@ -2014,9 +2010,6 @@ generate_code(struct brw_codegen *p, dst.hstride = BRW_HORIZONTAL_STRIDE_2; src[0] = retype(src[0], BRW_REGISTER_TYPE_UD); - src[0].vstride = BRW_VERTICAL_STRIDE_4; - src[0].width = BRW_WIDTH_4; - src[0].hstride = BRW_HORIZONTAL_STRIDE_1; brw_MOV(p, dst, src[0]); brw_set_default_access_mode(p, BRW_ALIGN_16); |