diff options
| author | Jason Ekstrand <[email protected]> | 2017-06-21 11:15:25 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-06-21 11:21:19 -0700 |
| commit | 17918a037242d04b1a455a2f7a0b869e7a568456 (patch) | |
| tree | 12253dbc183c433a73c6b1dbc1f4f2386dc73db1 | |
| parent | 78b843af3c30da8d47c3cbf9c77b59e36e4aa84b (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index abc7f989db8..3b7262f086b 100644 --- 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", |