summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorJason Ekstrand <jason.ekstrand@intel.com>2016-07-19 16:25:50 -0700
committerJason Ekstrand <jason.ekstrand@intel.com>2016-08-17 14:46:22 -0700
commit67ea60db0b69b06e2621f21ba5d3c88ed10e2028 (patch)
treea1581f293bde859caf5f90fe5b7cb4b9093a5f9c /src/mesa/drivers
parentdd46c8da31e2ad6c9ff4909b8759aac75d3766e6 (diff)
downloadexternal_mesa3d-67ea60db0b69b06e2621f21ba5d3c88ed10e2028.zip
external_mesa3d-67ea60db0b69b06e2621f21ba5d3c88ed10e2028.tar.gz
external_mesa3d-67ea60db0b69b06e2621f21ba5d3c88ed10e2028.tar.bz2
i965/miptree: Allow get_aux_isl_surf when there is no aux surface
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index fbb06de..1f974b3 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 */