From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 18 Jun 2018 04:47:52 +0000 (-0700)
Subject: iris: clean up some warnings so I can see through the noise
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8179dc760fd312bf606372fd68b398e2cf23dc7;p=mesa.git

iris: clean up some warnings so I can see through the noise
---

diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index 088ef23ac3d..f4e9318d297 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -556,7 +556,7 @@ iris_transfer_flush_region(struct pipe_context *pipe,
 static void
 iris_transfer_unmap(struct pipe_context *pipe, struct pipe_transfer *xfer)
 {
-   struct iris_transfer *map = xfer;
+   struct iris_transfer *map = (void *) xfer;
 
    if (map->unmap)
       map->unmap(map);
@@ -581,18 +581,6 @@ iris_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource)
 {
 }
 
-static boolean
-iris_generate_mipmap(struct pipe_context *ctx,
-                     struct pipe_resource *resource,
-                     enum pipe_format format,
-                     unsigned base_level,
-                     unsigned last_level,
-                     unsigned first_layer,
-                     unsigned last_layer)
-{
-   return true;
-}
-
 void
 iris_init_screen_resource_functions(struct pipe_screen *pscreen)
 {
diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 904113ddd9c..ca2acbb3921 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -1803,10 +1803,14 @@ iris_populate_fs_key(const struct iris_context *ice,
    key->coherent_fb_fetch = true;
 }
 
-   //pkt.SamplerCount =                                                     \
-      //DIV_ROUND_UP(CLAMP(stage_state->sampler_count, 0, 16), 4);          \
-   //pkt.PerThreadScratchSpace = prog_data->total_scratch == 0 ? 0 :        \
-      //ffs(stage_state->per_thread_scratch) - 11;                          \
+#if 0
+   // XXX: these need to go in INIT_THREAD_DISPATCH_FIELDS
+   pkt.SamplerCount =                                                     \
+      DIV_ROUND_UP(CLAMP(stage_state->sampler_count, 0, 16), 4);          \
+   pkt.PerThreadScratchSpace = prog_data->total_scratch == 0 ? 0 :        \
+      ffs(stage_state->per_thread_scratch) - 11;                          \
+
+#endif
 
 static uint64_t
 KSP(const struct iris_compiled_shader *shader)
@@ -2172,7 +2176,7 @@ iris_populate_binding_table(struct iris_context *ice,
    // - textures
    // - render targets - write and read
 
-   struct brw_stage_prog_data *prog_data = (void *) shader->prog_data;
+   //struct brw_stage_prog_data *prog_data = (void *) shader->prog_data;
    uint32_t *bt_map = binder->map + binder->bt_offset[stage];
    int s = 0;