From: Rhys Perry <pendingchaos02@gmail.com>
Date: Fri, 22 Jun 2018 20:47:43 +0000 (+0100)
Subject: nvc0: remove magic values in nve4_set_tex_handles()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c92eb71a65be5e4f71ace2f9d47549645ab49dad;p=mesa.git

nvc0: remove magic values in nve4_set_tex_handles()

With this commit, things no longer break if NVC0_CB_AUX_TEX_INFO is
changed to anything other than 0x20.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
---

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
index 0471fffe835..e7cd60169e9 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
@@ -755,7 +755,7 @@ nve4_set_tex_handles(struct nvc0_context *nvc0)
          dirty &= ~(1 << i);
 
          BEGIN_NVC0(push, NVC0_3D(CB_POS), 2);
-         PUSH_DATA (push, (8 + i) * 4);
+         PUSH_DATA (push, NVC0_CB_AUX_TEX_INFO(i));
          PUSH_DATA (push, nvc0->tex_handles[s][i]);
       } while (dirty);