i965/miptree: Move isl_surf_get_(hiz|mcs)_surf out of the assert

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101535
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101538
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101539
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 abc7f989db8c4a31d6a65aa618bae39c43aad474..3b7262f086b6d1f01bf920529570d8178ba279ae 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1672,8 +1672,9 @@ intel_miptree_alloc_mcs(struct brw_context *brw,
     * calculate equivalent MCS surface against it.
     */
    intel_miptree_get_isl_surf(brw, mt, &temp_main_surf);
-   assert(isl_surf_get_mcs_surf(&brw->isl_dev, &temp_main_surf,
-                                &temp_mcs_surf));
+   MAYBE_UNUSED bool ok =
+      isl_surf_get_mcs_surf(&brw->isl_dev, &temp_main_surf, &temp_mcs_surf);
+   assert(ok);
 
    /* Buffer needs to be initialised requiring the buffer to be immediately
     * mapped to cpu space for writing. Therefore do not use the gpu access
@@ -1832,8 +1833,9 @@ intel_miptree_alloc_hiz(struct brw_context *brw,
    struct isl_surf temp_hiz_surf;
 
    intel_miptree_get_isl_surf(brw, mt, &temp_main_surf);
-   assert(isl_surf_get_hiz_surf(&brw->isl_dev, &temp_main_surf,
-                                &temp_hiz_surf));
+   MAYBE_UNUSED bool ok =
+      isl_surf_get_hiz_surf(&brw->isl_dev, &temp_main_surf, &temp_hiz_surf);
+   assert(ok);
 
    const uint32_t alloc_flags = BO_ALLOC_FOR_RENDER;
    mt->hiz_buf = intel_alloc_aux_buffer(brw, "hiz-miptree",