From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 2 May 2018 21:28:27 +0000 (-0700)
Subject: iris: just turn batch reset_and_clear_caches into reset
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=053fb51125451f7779ee1b89d5d20f50480c0314;p=mesa.git

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 8ea7cf761bf..12aea86e9e4 100644
--- 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;
 }