[Mesa-dev] [PATCH 05/14] r600g: remove obsolete flushed texture initialization in color surface setup

[Marek Olšák]

On Fri, Jul 1, 2016 at 4:25 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> Seems to have been unnecessary for quite some time, and seems like an odd
> place to do the initialization anyway.

Are you sure?

No other place initializes the flushing texture except
r600_create_sampler_view_custom. If you call set_framebuffer_state
before create_sampler_view, the flushing texture must be created
there.

Also, "rtex = rtex->flushed_depth_texture;" is really required,
because otherwise it would do the DB->CB copy in place, which isn't
allowed.

Note that this file is only used by R600-R700.

Marek

> ---
>  src/gallium/drivers/r600/r600_state.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
> index e805d33..8b1b951 100644
> --- a/src/gallium/drivers/r600/r600_state.c
> +++ b/src/gallium/drivers/r600/r600_state.c
> @@ -842,12 +842,6 @@ static void r600_init_color_surface(struct r600_context *rctx,
>         int i;
>         bool blend_bypass = 0, blend_clamp = 1, do_endian_swap = FALSE;
>
> -       if (rtex->is_depth && !rtex->is_flushing_texture && !r600_can_read_depth(rtex)) {
> -               r600_init_flushed_depth_texture(&rctx->b.b, surf->base.texture, NULL);
> -               rtex = rtex->flushed_depth_texture;
> -               assert(rtex);
> -       }
> -
>         offset = rtex->surface.level[level].offset;
>         color_view = S_028080_SLICE_START(surf->base.u.tex.first_layer) |
>                      S_028080_SLICE_MAX(surf->base.u.tex.last_layer);
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev