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

Author: Nanley Chery <[email protected]>
Date:   Thu Dec 17 15:05:51 2020 -0800

iris: Drop batch param from iris_resource_prepare_render

Drop an unused parameter.

Reviewed-by: Kenneth Graunke <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8853>

---

 src/gallium/drivers/iris/iris_clear.c    | 4 ++--
 src/gallium/drivers/iris/iris_resolve.c  | 3 +--
 src/gallium/drivers/iris/iris_resource.h | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_clear.c 
b/src/gallium/drivers/iris/iris_clear.c
index 70023df8f9c..9135fc33580 100644
--- a/src/gallium/drivers/iris/iris_clear.c
+++ b/src/gallium/drivers/iris/iris_clear.c
@@ -370,8 +370,8 @@ clear_color(struct iris_context *ice,
    enum isl_aux_usage aux_usage =
       iris_resource_render_aux_usage(ice, res, format, false);
 
-   iris_resource_prepare_render(ice, batch, res, level,
-                                box->z, box->depth, aux_usage);
+   iris_resource_prepare_render(ice, res, level, box->z, box->depth,
+                                aux_usage);
    iris_emit_buffer_barrier_for(batch, res->bo, IRIS_DOMAIN_RENDER_WRITE);
 
    struct blorp_surf surf;
diff --git a/src/gallium/drivers/iris/iris_resolve.c 
b/src/gallium/drivers/iris/iris_resolve.c
index 45787a1c6df..5c4936528bb 100644
--- a/src/gallium/drivers/iris/iris_resolve.c
+++ b/src/gallium/drivers/iris/iris_resolve.c
@@ -249,7 +249,7 @@ iris_predraw_resolve_framebuffer(struct iris_context *ice,
             ice->state.stage_dirty |= IRIS_ALL_STAGE_DIRTY_BINDINGS;
          }
 
-         iris_resource_prepare_render(ice, batch, res, surf->view.base_level,
+         iris_resource_prepare_render(ice, res, surf->view.base_level,
                                       surf->view.base_array_layer,
                                       surf->view.array_len,
                                       aux_usage);
@@ -1012,7 +1012,6 @@ iris_resource_render_aux_usage(struct iris_context *ice,
 
 void
 iris_resource_prepare_render(struct iris_context *ice,
-                             struct iris_batch *batch,
                              struct iris_resource *res, uint32_t level,
                              uint32_t start_layer, uint32_t layer_count,
                              enum isl_aux_usage aux_usage)
diff --git a/src/gallium/drivers/iris/iris_resource.h 
b/src/gallium/drivers/iris/iris_resource.h
index 2662181666a..b403a2f85ee 100644
--- a/src/gallium/drivers/iris/iris_resource.h
+++ b/src/gallium/drivers/iris/iris_resource.h
@@ -505,7 +505,6 @@ enum isl_aux_usage iris_resource_render_aux_usage(struct 
iris_context *ice,
                                                   enum isl_format render_fmt,
                                                   bool draw_aux_disabled);
 void iris_resource_prepare_render(struct iris_context *ice,
-                                  struct iris_batch *batch,
                                   struct iris_resource *res, uint32_t level,
                                   uint32_t start_layer, uint32_t layer_count,
                                   enum isl_aux_usage aux_usage);

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to