[Mesa-stable] [Mesa-dev] [PATCH] i965: Remember to call intel_prepare_render() before blitting.

[Ian Romanick]

On 08/06/2013 02:36 PM, Kenneth Graunke wrote:
> Otherwise, blits to the window system buffer may cause crashes,
> since dst_irb->mt may be NULL.
>
> This code is lifted straight out of brw_blorp_framebuffer()'s
> try_blorp_blit() helper.
>
> Fixes crashes in Piglit's fbo-sys-blit on systems without BLORP.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65919
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> Cc: "9.2" <mesa-stable at lists.freedesktop.org>

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>   src/mesa/drivers/dri/i965/intel_fbo.c | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
> index fb0bb71..1692325 100644
> --- a/src/mesa/drivers/dri/i965/intel_fbo.c
> +++ b/src/mesa/drivers/dri/i965/intel_fbo.c
> @@ -695,6 +695,11 @@ intel_blit_framebuffer_with_blitter(struct gl_context *ctx,
>   {
>      struct brw_context *brw = brw_context(ctx);
>
> +   /* Sync up the state of window system buffers.  We need to do this before
> +    * we go looking for the buffers.
> +    */
> +   intel_prepare_render(brw);
> +
>      if (mask & GL_COLOR_BUFFER_BIT) {
>         GLint i;
>         const struct gl_framebuffer *drawFb = ctx->DrawBuffer;
>