From c6dada70f0e70a17b4ae06ba8b28d16b22ec14be Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Wed, 13 Feb 2019 16:22:34 -0800 Subject: [PATCH] i965: Rename intel_mipmap_tree::r8stencil_* -> ::shadow_* Use more generic field names. We'll reuse these fields for a workaround with ASTC miptrees. Reviewed-by: Eleni Maria Stea --- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 8 ++++---- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 16 ++++++++-------- src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index ece3197a858..c55182d7ffb 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -571,15 +571,15 @@ static void brw_update_texture_surface(struct gl_context *ctx, if (obj->StencilSampling && firstImage->_BaseFormat == GL_DEPTH_STENCIL) { if (devinfo->gen <= 7) { - assert(mt->r8stencil_mt && !mt->stencil_mt->r8stencil_needs_update); - mt = mt->r8stencil_mt; + assert(mt->shadow_mt && !mt->stencil_mt->shadow_needs_update); + mt = mt->shadow_mt; } else { mt = mt->stencil_mt; } format = ISL_FORMAT_R8_UINT; } else if (devinfo->gen <= 7 && mt->format == MESA_FORMAT_S_UINT8) { - assert(mt->r8stencil_mt && !mt->r8stencil_needs_update); - mt = mt->r8stencil_mt; + assert(mt->shadow_mt && !mt->shadow_needs_update); + mt = mt->shadow_mt; format = ISL_FORMAT_R8_UINT; } diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index fe77d72fae4..e364fed2cc7 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -1214,7 +1214,7 @@ intel_miptree_release(struct intel_mipmap_tree **mt) brw_bo_unreference((*mt)->bo); intel_miptree_release(&(*mt)->stencil_mt); - intel_miptree_release(&(*mt)->r8stencil_mt); + intel_miptree_release(&(*mt)->shadow_mt); intel_miptree_aux_buffer_free((*mt)->aux_buf); free_aux_state_map((*mt)->aux_state); @@ -2427,7 +2427,7 @@ intel_miptree_finish_write(struct brw_context *brw, switch (mt->aux_usage) { case ISL_AUX_USAGE_NONE: if (mt->format == MESA_FORMAT_S_UINT8 && devinfo->gen <= 7) - mt->r8stencil_needs_update = true; + mt->shadow_needs_update = true; break; case ISL_AUX_USAGE_MCS: @@ -2933,9 +2933,9 @@ intel_update_r8stencil(struct brw_context *brw, assert(src->surf.size_B > 0); - if (!mt->r8stencil_mt) { + if (!mt->shadow_mt) { assert(devinfo->gen > 6); /* Handle MIPTREE_LAYOUT_GEN6_HIZ_STENCIL */ - mt->r8stencil_mt = make_surface( + mt->shadow_mt = make_surface( brw, src->target, MESA_FORMAT_R_UINT8, @@ -2949,13 +2949,13 @@ intel_update_r8stencil(struct brw_context *brw, ISL_TILING_Y0_BIT, ISL_SURF_USAGE_TEXTURE_BIT, BO_ALLOC_BUSY, 0, NULL); - assert(mt->r8stencil_mt); + assert(mt->shadow_mt); } - if (src->r8stencil_needs_update == false) + if (src->shadow_needs_update == false) return; - struct intel_mipmap_tree *dst = mt->r8stencil_mt; + struct intel_mipmap_tree *dst = mt->shadow_mt; for (int level = src->first_level; level <= src->last_level; level++) { const unsigned depth = src->surf.dim == ISL_SURF_DIM_3D ? @@ -2975,7 +2975,7 @@ intel_update_r8stencil(struct brw_context *brw, } brw_cache_flush_for_read(brw, dst->bo); - src->r8stencil_needs_update = false; + src->shadow_needs_update = false; } static void * diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h index 17668944adc..1a7507023a1 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h @@ -294,16 +294,16 @@ struct intel_mipmap_tree struct intel_mipmap_tree *stencil_mt; /** - * \brief Stencil texturing miptree for sampling from a stencil texture + * \brief Shadow miptree for sampling when the main isn't supported by HW. * - * Some hardware doesn't support sampling from the stencil texture as - * required by the GL_ARB_stencil_texturing extenion. To workaround this we - * blit the texture into a new texture that can be sampled. + * To workaround various sampler bugs and limitations, we blit the main + * texture into a new texture that can be sampled. * - * \see intel_update_r8stencil() + * This miptree may be used for: + * - Stencil texturing (pre-BDW) as required by GL_ARB_stencil_texturing. */ - struct intel_mipmap_tree *r8stencil_mt; - bool r8stencil_needs_update; + struct intel_mipmap_tree *shadow_mt; + bool shadow_needs_update; /** * \brief CCS, MCS, or HiZ auxiliary buffer. -- 2.30.2