<div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr">On Tue, Jun 26, 2018, 11:57 AM Dylan Baker <<a href="mailto:dylan@pnwbakers.com">dylan@pnwbakers.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Quoting Marek Olšák (2018-06-18 16:33:08)<br>
> From: Marek Olšák <<a href="mailto:marek.olsak@amd.com" target="_blank" rel="noreferrer">marek.olsak@amd.com</a>><br>
> <br>
> Some fields shouldn't be initialized, like framebuffers_bound and other stats.<br>
> It's hopefully complete now.<br>
> <br>
> Cc: 18.1 <<a href="mailto:mesa-stable@lists.freedesktop.org" target="_blank" rel="noreferrer">mesa-stable@lists.freedesktop.org</a>><br>
> ---<br>
>  src/gallium/drivers/radeonsi/si_texture.c | 31 ++++++++++++++++++-----<br>
>  1 file changed, 25 insertions(+), 6 deletions(-)<br>
> <br>
> diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c<br>
> index 2103134156d..e1afe71a3c7 100644<br>
> --- a/src/gallium/drivers/radeonsi/si_texture.c<br>
> +++ b/src/gallium/drivers/radeonsi/si_texture.c<br>
> @@ -552,36 +552,55 @@ static void si_reallocate_texture_inplace(struct si_context *sctx,<br>
>         /* Replace the structure fields of rtex. */<br>
>         rtex->buffer.b.b.bind = templ.bind;<br>
>         pb_reference(&rtex->buffer.buf, new_tex->buffer.buf);<br>
>         rtex->buffer.gpu_address = new_tex->buffer.gpu_address;<br>
>         rtex->buffer.vram_usage = new_tex->buffer.vram_usage;<br>
>         rtex->buffer.gart_usage = new_tex->buffer.gart_usage;<br>
>         rtex->buffer.bo_size = new_tex->buffer.bo_size;<br>
>         rtex->buffer.bo_alignment = new_tex->buffer.bo_alignment;<br>
>         rtex->buffer.domains = new_tex->buffer.domains;<br>
>         rtex->buffer.flags = new_tex->buffer.flags;<br>
> -       rtex->size = new_tex->size;<br>
> -       rtex->db_render_format = new_tex->db_render_format;<br>
> -       rtex->db_compatible = new_tex->db_compatible;<br>
> -       rtex->can_sample_z = new_tex->can_sample_z;<br>
> -       rtex->can_sample_s = new_tex->can_sample_s;<br>
> +<br>
>         rtex->surface = new_tex->surface;<br>
> +       rtex->size = new_tex->size;<br>
> +       r600_texture_reference(&rtex->flushed_depth_texture,<br>
> +                              new_tex->flushed_depth_texture);<br>
> +<br>
>         rtex->fmask_offset = new_tex->fmask_offset;<br>
>         rtex->cmask = new_tex->cmask;<br>
> +       r600_resource_reference(&rtex->cmask_buffer, new_tex->cmask_buffer);<br>
> +       rtex->dcc_offset = new_tex->dcc_offset;<br>
>         rtex->cb_color_info = new_tex->cb_color_info;<br>
> +       memcpy(rtex->color_clear_value, new_tex->color_clear_value,<br>
> +              sizeof(rtex->color_clear_value));<br>
>         rtex->last_msaa_resolve_target_micro_mode = new_tex->last_msaa_resolve_target_micro_mode;<br>
> +<br>
>         rtex->htile_offset = new_tex->htile_offset;<br>
> +       rtex->depth_clear_value = new_tex->depth_clear_value;<br>
> +       rtex->dirty_level_mask = new_tex->dirty_level_mask;<br>
> +       rtex->stencil_dirty_level_mask = new_tex->stencil_dirty_level_mask;<br>
> +       rtex->db_render_format = new_tex->db_render_format;<br>
> +       rtex->stencil_clear_value = new_tex->stencil_clear_value;<br>
>         rtex->tc_compatible_htile = new_tex->tc_compatible_htile;<br>
>         rtex->depth_cleared = new_tex->depth_cleared;<br>
>         rtex->stencil_cleared = new_tex->stencil_cleared;<br>
> +       rtex->upgraded_depth = new_tex->upgraded_depth;<br>
> +       rtex->db_compatible = new_tex->db_compatible;<br>
> +       rtex->can_sample_z = new_tex->can_sample_z;<br>
> +       rtex->can_sample_s = new_tex->can_sample_s;<br>
> +<br>
> +       rtex->separate_dcc_dirty = new_tex->separate_dcc_dirty;<br>
>         rtex->dcc_gather_statistics = new_tex->dcc_gather_statistics;<br>
> -       rtex->framebuffers_bound = new_tex->framebuffers_bound;<br>
> +       r600_resource_reference(&rtex->dcc_separate_buffer,<br>
> +                               new_tex->dcc_separate_buffer);<br>
> +       r600_resource_reference(&rtex->last_dcc_separate_buffer,<br>
> +                               new_tex->last_dcc_separate_buffer);<br>
>  <br>
>         if (new_bind_flag == PIPE_BIND_LINEAR) {<br>
>                 assert(!rtex->htile_offset);<br>
>                 assert(!rtex->cmask.size);<br>
>                 assert(!rtex->surface.fmask_size);<br>
>                 assert(!rtex->dcc_offset);<br>
>                 assert(!rtex->is_depth);<br>
>         }<br>
>  <br>
>         r600_texture_reference(&new_tex, NULL);<br>
> -- <br>
> 2.17.1<br>
> <br>
> _______________________________________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank" rel="noreferrer">mesa-dev@lists.freedesktop.org</a><br>
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
<br>
Hi Marek,<br>
<br>
This doesn't apply cleanly to 18.1. It relies on at least<br>
1ba87f4438069964af6548f4fa05386be999f4de, which is massive and also doesn't<br>
apply cleanly. What would you like to do?<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">Let's ignore this patch.</div><div dir="auto"><br></div><div dir="auto">Thanks,</div><div dir="auto">Marek</div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Dylan<br>
</blockquote></div></div></div>