From: Matt Turner <mattst88@gmail.com>
Date: Mon, 19 Oct 2015 22:01:20 +0000 (-0700)
Subject: i965: Compact acc_wr_control only on Gen6+.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35f3f06c8a2e614beac90cf25b9dfff98bb420dc;p=mesa.git

i965: Compact acc_wr_control only on Gen6+.

It only exists on Gen6+, and the next patches will add compaction
support for the (unused) field in the same location on earlier
platforms.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index facf3cd1b88..b122deca727 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -1016,7 +1016,10 @@ brw_try_compact_instruction(const struct brw_device_info *devinfo,
    if (!set_subreg_index(devinfo, &temp, src, is_immediate))
       return false;
 
-   compact(acc_wr_control);
+   if (devinfo->gen >= 6) {
+      compact(acc_wr_control);
+   }
+
    compact(cond_modifier);
 
    if (devinfo->gen <= 6)
@@ -1224,7 +1227,10 @@ brw_uncompact_instruction(const struct brw_device_info *devinfo, brw_inst *dst,
 
    set_uncompacted_subreg(devinfo, dst, src);
 
-   uncompact(acc_wr_control);
+   if (devinfo->gen >= 6) {
+      uncompact(acc_wr_control);
+   }
+
    uncompact(cond_modifier);
 
    if (devinfo->gen <= 6)