Module: Mesa Branch: master Commit: 42011be1e27f59d750b781c10766e19ec0ee6ff5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=42011be1e27f59d750b781c10766e19ec0ee6ff5
Author: Chad Versace <chadvers...@chromium.org> Date: Fri Dec 9 16:22:52 2016 -0800 i965/mt: Disable HiZ when sharing depth buffer externally (v2) intel_miptree_make_shareable() discarded and disabled CCS. Fix it so that it discards and disables HiZ too. Fixes dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer on Skylake. v2: Actually do what the commit message says. Discard the HiZ buffer. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=98329 Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Cc: Nanley Chery <nanley.g.ch...@intel.com Cc: Haixia Shi <h...@chromium.org> Cc: mesa-sta...@lists.freedesktop.org --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 29 ++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index 15404da..c4afab9 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -945,6 +945,19 @@ intel_miptree_reference(struct intel_mipmap_tree **dst, *dst = src; } +static void +intel_miptree_hiz_buffer_free(struct intel_miptree_hiz_buffer *hiz_buf) +{ + if (hiz_buf == NULL) + return; + + if (hiz_buf->mt) + intel_miptree_release(&hiz_buf->mt); + else + drm_intel_bo_unreference(hiz_buf->aux_base.bo); + + free(hiz_buf); +} void intel_miptree_release(struct intel_mipmap_tree **mt) @@ -961,13 +974,7 @@ intel_miptree_release(struct intel_mipmap_tree **mt) drm_intel_bo_unreference((*mt)->bo); intel_miptree_release(&(*mt)->stencil_mt); intel_miptree_release(&(*mt)->r8stencil_mt); - if ((*mt)->hiz_buf) { - if ((*mt)->hiz_buf->mt) - intel_miptree_release(&(*mt)->hiz_buf->mt); - else - drm_intel_bo_unreference((*mt)->hiz_buf->aux_base.bo); - free((*mt)->hiz_buf); - } + intel_miptree_hiz_buffer_free((*mt)->hiz_buf); if ((*mt)->mcs_buf) { drm_intel_bo_unreference((*mt)->mcs_buf->bo); free((*mt)->mcs_buf); @@ -2311,6 +2318,8 @@ intel_miptree_all_slices_resolve_color(struct brw_context *brw, * Fast color clears are unsafe with shared buffers, so we need to resolve and * then discard the MCS buffer, if present. We also set the no_ccs flag to * ensure that no MCS buffer gets allocated in the future. + * + * HiZ is similarly unsafe with shared buffers. */ void intel_miptree_make_shareable(struct brw_context *brw, @@ -2331,6 +2340,12 @@ intel_miptree_make_shareable(struct brw_context *brw, mt->mcs_buf = NULL; } + if (mt->hiz_buf) { + intel_miptree_all_slices_resolve_depth(brw, mt); + intel_miptree_hiz_buffer_free(mt->hiz_buf); + mt->hiz_buf = NULL; + } + mt->disable_aux_buffers = true; } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
