aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorConnor Abbott <[email protected]>2014-08-01 16:30:26 -0700
committerKenneth Graunke <[email protected]>2014-10-15 17:05:05 -0700
commit4bffcb7e8ecb29bb16890fde581ee7aafc134ccb (patch)
tree2cf5853d9507d79538c49f0aa9ee30f6d8ce8c5b /src/mesa/drivers/dri
parenteaadc431920fe31b13c11b0c78e7eb2226a920a0 (diff)
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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Chris Forbes <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_visitor.cpp5
1 files changed, 1 insertions, 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 3096e3fd8d6..c741ca34df1 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;