iris: just turn batch reset_and_clear_caches into reset

diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 8ea7cf761bf94ed556727713a137d1a3f06bde18..12aea86e9e47d24adbffad5c0dec75582059cb88 100644 (file)
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -226,12 +226,7 @@ iris_batch_reset(struct iris_batch *batch)
 
    if (batch->state_sizes)
       _mesa_hash_table_clear(batch->state_sizes, NULL);
-}
 
-static void
-iris_batch_reset_and_clear_caches(struct iris_batch *batch)
-{
-   iris_batch_reset(batch);
    iris_cache_sets_clear(batch);
 }
 
@@ -456,7 +451,7 @@ _iris_batch_flush_fence(struct iris_batch *batch,
    batch->aperture_space = 0;
 
    /* Start a new batch buffer. */
-   iris_batch_reset_and_clear_caches(batch);
+   iris_batch_reset(batch);
 
    return 0;
 }