On Wed, Feb 13, 2019 at 12:05:00PM +0200, Eleni Maria Stea wrote:
> For CopyImageSubData to copy the data during the 1st draw call, we need
> to update the shadow tree right before the rendering.
>
> v2:
> - Added assertion that the miptree doesn't need update at the time we
> update the texture surface. (Nanley Chery)
>
> v3:
> - As we now update the tree before the rendering we don't need to copy
> the data during the unmap anymore. Removed the unnecessary update from
> the intel_miptree_unmap in intel_mipmap_tree.c (Nanley Chery)
> ---
> src/mesa/drivers/dri/i965/brw_draw.c | 5 +++++
> src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +-
> src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 13 -------------
> 3 files changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_draw.c
> b/src/mesa/drivers/dri/i965/brw_draw.c
> index 40bcf82ae8d..d07349419cc 100644
> --- a/src/mesa/drivers/dri/i965/brw_draw.c
> +++ b/src/mesa/drivers/dri/i965/brw_draw.c
> @@ -559,6 +559,11 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool
> rendering,
> tex_obj->mt->format == MESA_FORMAT_S_UINT8) {
> intel_update_r8stencil(brw, tex_obj->mt);
> }
> +
> + if (intel_miptree_has_etc_shadow(brw, tex_obj->mt) &&
> + tex_obj->mt->shadow_needs_update) {
> + intel_miptree_update_etc_shadow_levels(brw, tex_obj->mt);
> + }
> }
>
> /* Resolve color for each active shader image. */
> 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 c3d267721e1..19a46fcf243 100644
> --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
> @@ -582,7 +582,7 @@ static void brw_update_texture_surface(struct gl_context
> *ctx,
> mt = mt->shadow_mt;
> format = ISL_FORMAT_R8_UINT;
> } else if (intel_miptree_needs_fake_etc(brw, mt)) {
> - assert(mt->shadow_mt);
> + assert(mt->shadow_mt && !mt->shadow_needs_update);
> mt = mt->shadow_mt;
> }
>
> diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> index 1643ce2eeb2..89b31c78bc4 100644
> --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
> @@ -3780,7 +3780,6 @@ intel_miptree_unmap(struct brw_context *brw,
> unsigned int slice)
> {
> struct intel_miptree_map *map = mt->level[level].slice[slice].map;
> - int level_w, level_h;
>
> assert(mt->surf.samples == 1);
>
> @@ -3790,21 +3789,10 @@ intel_miptree_unmap(struct brw_context *brw,
> DBG("%s: mt %p (%s) level %d slice %d\n", __func__,
> mt, _mesa_get_format_name(mt->format), level, slice);
>
> - level_w = minify(mt->surf.phys_level0_sa.width,
> - level - mt->first_level);
> - level_h = minify(mt->surf.phys_level0_sa.height,
> - level - mt->first_level);
> -
> if (map->unmap)
> map->unmap(brw, mt, map, level, slice);
>
> intel_miptree_release_map(mt, level, slice);
> -
> - if (intel_miptree_has_etc_shadow(brw, mt) && mt->shadow_needs_update) {
> - mt->shadow_needs_update = false;
> - intel_miptree_update_etc_shadow(brw, mt, level, slice, level_w,
> - level_h);
> - }
> }
>
> enum isl_surf_dim
> @@ -3984,6 +3972,5 @@ intel_miptree_update_etc_shadow_levels(struct
> brw_context *brw,
> level_h);
> }
> }
> -
Unrelated change.
> mt->shadow_needs_update = false;
> }
> --
> 2.20.1
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
