[Mesa-dev] [PATCH] st/dri: fix postprocessing crash when there's no depth buffer

[Brian Paul]

On 05/26/2015 11:33 AM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> Cc: 10.6 10.5 <mesa-stable at lists.freedesktop.org>
> ---
>   src/gallium/state_trackers/dri/dri_context.c | 9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
> index 9f11b15..3d8af65 100644
> --- a/src/gallium/state_trackers/dri/dri_context.c
> +++ b/src/gallium/state_trackers/dri/dri_context.c
> @@ -244,11 +244,10 @@ dri_make_current(__DRIcontext * cPriv,
>
>      ctx->stapi->make_current(ctx->stapi, ctx->st, &draw->base, &read->base);
>
> -   // This is ok to call here. If they are already init, it's a no-op.
> -   if (draw->textures[ST_ATTACHMENT_BACK_LEFT] && draw->textures[ST_ATTACHMENT_DEPTH_STENCIL]
> -      && ctx->pp)
> -         pp_init_fbos(ctx->pp, draw->textures[ST_ATTACHMENT_BACK_LEFT]->width0,
> -            draw->textures[ST_ATTACHMENT_BACK_LEFT]->height0);
> +   /* This is ok to call here. If they are already init, it's a no-op. */
> +   if (ctx->pp && draw->textures[ST_ATTACHMENT_BACK_LEFT])
> +      pp_init_fbos(ctx->pp, draw->textures[ST_ATTACHMENT_BACK_LEFT]->width0,
> +                   draw->textures[ST_ATTACHMENT_BACK_LEFT]->height0);
>
>      return GL_TRUE;
>   }
>

Reviewed-by: Brian Paul <brianp at vmware.com>