From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 23 Aug 2018 09:15:12 +0000 (-0700)
Subject: iris: fix sampler state setting
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e4d22b16c8470f20d69dc09e7fa9851324217a44;p=mesa.git

iris: fix sampler state setting
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 055fddff82c..bfa52e3806c 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1170,8 +1170,9 @@ iris_bind_sampler_states(struct pipe_context *ctx,
     * in the dynamic state memory zone, so we can point to it via the
     * 3DSTATE_SAMPLER_STATE_POINTERS_* commands.
     */
-   void *map = upload_state(ice->state.dynamic_uploader, &shs->sampler_table,
-                            count * 4 * GENX(SAMPLER_STATE_length), 32);
+   uint32_t *map =
+      upload_state(ice->state.dynamic_uploader, &shs->sampler_table,
+                   count * 4 * GENX(SAMPLER_STATE_length), 32);
    if (unlikely(!map))
       return;
 
@@ -1202,7 +1203,7 @@ iris_bind_sampler_states(struct pipe_context *ctx,
          }
 
          for (uint32_t j = 0; j < GENX(SAMPLER_STATE_length); j++)
-            ((uint32_t *) map)[j] = state->sampler_state[j] | dynamic[j];
+            map[j] = state->sampler_state[j] | dynamic[j];
       }
 
       map += GENX(SAMPLER_STATE_length);