From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 17 May 2016 00:28:19 +0000 (-0700)
Subject: i965: Fix brw_regs_equal() for NaN and positive/negative zero.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1539009bf01773c2cf18e436b0373fab300e5b67;p=mesa.git

i965: Fix brw_regs_equal() for NaN and positive/negative zero.

We'd like the comparisons to mean "the exact same bits".  Comparing
doubles won't do that for NaN values or positive vs. negative zero.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_reg.h b/src/mesa/drivers/dri/i965/brw_reg.h
index 71e1024428a..b0ef94e96d0 100644
--- a/src/mesa/drivers/dri/i965/brw_reg.h
+++ b/src/mesa/drivers/dri/i965/brw_reg.h
@@ -260,6 +260,7 @@ struct brw_reg {
       };
 
       double df;
+      uint64_t u64;
       float f;
       int   d;
       unsigned ud;
@@ -270,7 +271,7 @@ static inline bool
 brw_regs_equal(const struct brw_reg *a, const struct brw_reg *b)
 {
    const bool df = a->type == BRW_REGISTER_TYPE_DF && a->file == IMM;
-   return a->bits == b->bits && (df ? a->df == b->df : a->ud == b->ud);
+   return a->bits == b->bits && (df ? a->u64 == b->u64 : a->ud == b->ud);
 }
 
 struct brw_indirect {