From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 22 Apr 2015 12:01:24 +0000 (+0300)
Subject: i965/fs: Fix passing an immediate to half().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=88414de45e723a7fe8f052a3ab616aa7bc568519;p=mesa.git

i965/fs: Fix passing an immediate to half().

Immediates are generally uniform, they yield the same value to both
halves of any instruction.

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_ir_fs.h b/src/mesa/drivers/dri/i965/brw_ir_fs.h
index 0727ac5109e..acbf617cfa6 100644
--- a/src/mesa/drivers/dri/i965/brw_ir_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_ir_fs.h
@@ -183,10 +183,10 @@ half(fs_reg reg, unsigned idx)
 {
    assert(idx < 2);
 
-   if (reg.file == UNIFORM)
+   if (reg.file == UNIFORM || reg.file == IMM)
       return reg;
 
-   assert(idx == 0 || (reg.file != HW_REG && reg.file != IMM));
+   assert(idx == 0 || reg.file != HW_REG);
    assert(reg.width == 16);
    reg.width = 8;
    return horiz_offset(reg, 8 * idx);