Mesa (master): i965: Retype atomics to UD in Gen8 code generation.

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: db6ffa29c84178642889db237de1cfa75cf85885
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db6ffa29c84178642889db237de1cfa75cf85885

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jul 11 17:07:03 2014 -0700

i965: Retype atomics to UD in Gen8 code generation.

Kind of a moot point since we're deleting Gen8 code generation, but
this at least helps make it match the Gen4-7 code.  It's probably more
reasonable than using float.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/drivers/dri/i965/gen8_fs_generator.cpp   |    6 ++++--
 src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
index f4aae67..b7e7cf9 100644
--- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
@@ -841,7 +841,8 @@ gen8_fs_generator::generate_untyped_atomic(fs_inst *ir,
 
    gen8_instruction *inst = next_inst(BRW_OPCODE_SEND);
    gen8_set_dst(brw, inst, retype(dst, BRW_REGISTER_TYPE_UD));
-   gen8_set_src0(brw, inst, brw_message_reg(ir->base_mrf));
+   gen8_set_src0(brw, inst, retype(brw_message_reg(ir->base_mrf),
+                                   BRW_REGISTER_TYPE_UD));
    gen8_set_dp_message(brw, inst, HSW_SFID_DATAPORT_DATA_CACHE_1,
                        surf_index.dw1.ud,
                        HSW_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_OP,
@@ -867,7 +868,8 @@ gen8_fs_generator::generate_untyped_surface_read(fs_inst *ir,
 
    gen8_instruction *inst = next_inst(BRW_OPCODE_SEND);
    gen8_set_dst(brw, inst, retype(dst, BRW_REGISTER_TYPE_UD));
-   gen8_set_src0(brw, inst, brw_message_reg(ir->base_mrf));
+   gen8_set_src0(brw, inst, retype(brw_message_reg(ir->base_mrf),
+                                   BRW_REGISTER_TYPE_UD));
    gen8_set_dp_message(brw, inst, HSW_SFID_DATAPORT_DATA_CACHE_1,
                        surf_index.dw1.ud,
                        HSW_DATAPORT_DC_PORT1_UNTYPED_SURFACE_READ,
diff --git a/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp b/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp
index cbac89d..3a81cf2 100644
--- a/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_vec4_generator.cpp
@@ -480,7 +480,8 @@ gen8_vec4_generator::generate_untyped_atomic(vec4_instruction *ir,
 
    gen8_instruction *inst = next_inst(BRW_OPCODE_SEND);
    gen8_set_dst(brw, inst, retype(dst, BRW_REGISTER_TYPE_UD));
-   gen8_set_src0(brw, inst, brw_message_reg(ir->base_mrf));
+   gen8_set_src0(brw, inst, retype(brw_message_reg(ir->base_mrf),
+                                   BRW_REGISTER_TYPE_UD));
    gen8_set_dp_message(brw, inst, HSW_SFID_DATAPORT_DATA_CACHE_1,
                        surf_index.dw1.ud,
                        HSW_DATAPORT_DC_PORT1_UNTYPED_ATOMIC_OP_SIMD4X2,
@@ -505,7 +506,8 @@ gen8_vec4_generator::generate_untyped_surface_read(vec4_instruction *ir,
 
    gen8_instruction *inst = next_inst(BRW_OPCODE_SEND);
    gen8_set_dst(brw, inst, retype(dst, BRW_REGISTER_TYPE_UD));
-   gen8_set_src0(brw, inst, brw_message_reg(ir->base_mrf));
+   gen8_set_src0(brw, inst, retype(brw_message_reg(ir->base_mrf),
+                                   BRW_REGISTER_TYPE_UD));
    gen8_set_dp_message(brw, inst, HSW_SFID_DATAPORT_DATA_CACHE_1,
                        surf_index.dw1.ud,
                        HSW_DATAPORT_DC_PORT1_UNTYPED_SURFACE_READ,