From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 19 Jul 2016 23:25:50 +0000 (-0700)
Subject: i965/miptree: Allow get_aux_isl_surf when there is no aux surface
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67ea60db0b69b06e2621f21ba5d3c88ed10e2028;p=mesa.git

i965/miptree: Allow get_aux_isl_surf when there is no aux surface

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index fbb06de162a..1f974b3c11a 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -3187,7 +3187,8 @@ intel_miptree_get_aux_isl_surf(struct brw_context *brw,
    } else if (mt->fast_clear_state != INTEL_FAST_CLEAR_STATE_NO_MCS) {
       *usage = ISL_AUX_USAGE_CCS_D;
    } else {
-      unreachable("Invalid MCS miptree");
+      *usage = ISL_AUX_USAGE_NONE;
+      return;
    }
 
    /* Figure out the format and tiling of the auxiliary surface */