Mesa (master): i965/fs: don't use ir->type in emit_texture_gen4()

[Kenneth Graunke]

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

Author: Connor Abbott <connor.abbott at intel.com>
Date:   Fri Aug  1 16:30:26 2014 -0700

i965/fs: don't use ir->type in emit_texture_gen4()

We already have the type from the original destination.

Signed-off-by: Connor Abbott <connor.abbott at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Chris Forbes <chrisf at ijw.co.nz>

---

 src/mesa/drivers/dri/i965/brw_fs_visitor.cpp |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 3096e3f..c741ca3 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -1296,10 +1296,7 @@ fs_visitor::emit_texture_gen4(ir_texture *ir, fs_reg dst,
        * this weirdness around to the expected layout.
        */
       orig_dst = dst;
-      dst = fs_reg(GRF, virtual_grf_alloc(8),
-                   (brw->is_g4x ?
-                    brw_type_for_base_type(ir->type) :
-                    BRW_REGISTER_TYPE_F));
+      dst = fs_reg(GRF, virtual_grf_alloc(8), orig_dst.type);
    }
 
    enum opcode opcode;