From: Nanley Chery <nanley.g.chery@intel.com>
Date: Wed, 25 Apr 2018 00:16:50 +0000 (-0700)
Subject: i965/clear: Remove an early return in fast_clear_depth
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5b315f3ad1451b7c24e29f534cd1c7ed0de0fa77;p=mesa.git

i965/clear: Remove an early return in fast_clear_depth

Reduce complexity and allow the next patch to delete some code. With
this change, clear operations will still be skipped and setting the
aux_state will cause no side-effects.

Remove the associated comment which implies an early return.

Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c
index 2f61ea8ef15..ba79447fc87 100644
--- a/src/mesa/drivers/dri/i965/brw_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_clear.c
@@ -231,10 +231,6 @@ brw_fast_clear_depth(struct gl_context *ctx)
    }
 
    if (!need_clear) {
-      /* If all of the layers we intend to clear are already in the clear
-       * state then simply updating the miptree fast clear value is sufficient
-       * to change their clear value.
-       */
       if (devinfo->gen >= 10 && !same_clear_value) {
          /* Before gen10, it was enough to just update the clear value in the
           * miptree. But on gen10+, we let blorp update the clear value state
@@ -255,7 +251,6 @@ brw_fast_clear_depth(struct gl_context *ctx)
          }
          brw_emit_pipe_control_flush(brw, PIPE_CONTROL_STATE_CACHE_INVALIDATE);
       }
-      return true;
    }
 
    for (unsigned a = 0; a < num_layers; a++) {