Mesa (master): broadcom/vc5: Propagate vc4 aliasing fix to vc5.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Oct 20 17:05:54 2017 -0700

broadcom/vc5: Propagate vc4 aliasing fix to vc5.

See e5fea0d621af2b14cf6c5e364eeaf293db460f2a

---

 src/broadcom/compiler/vir_lower_uniforms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/broadcom/compiler/vir_lower_uniforms.c b/src/broadcom/compiler/vir_lower_uniforms.c
index b2741994a2..7f3bb8460e 100644
--- a/src/broadcom/compiler/vir_lower_uniforms.c
+++ b/src/broadcom/compiler/vir_lower_uniforms.c
@@ -66,7 +66,7 @@ remove_uniform(struct hash_table *ht, struct qreg reg)
 
         entry = _mesa_hash_table_search(ht, key);
         assert(entry);
-        entry->data--;
+        entry->data = (void *)(((uintptr_t) entry->data) - 1);
         if (entry->data == NULL)
                 _mesa_hash_table_remove(ht, entry);
 }