[Mesa-dev] Mesa (10.2): i965: Always intel_prepare_render() after invalidating front buffers.

[Ian Romanick]

I just noticed that this commit breaks piglit's read-front on both
master and, sadly, 10.2.  I'm going to revert it from 10.2 so that I can
release RC2 without regressions. :(

On 05/07/2014 09:51 AM, Ian Romanick wrote:
> Module: Mesa
> Branch: 10.2
> Commit: a1dd1e62fa911a593cca354349e43149bd5f6e45
> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1dd1e62fa911a593cca354349e43149bd5f6e45
> 
> Author: Kenneth Graunke <kenneth at whitecape.org>
> Date:   Mon May  5 11:02:18 2014 -0700
> 
> i965: Always intel_prepare_render() after invalidating front buffers.
> 
> Fixes glean/texture_srgb, which hit recursive-flush prevention
> assertions in vbo_exec_FlushVertices.

Is there anything extra that needs to be done to trigger this assertion?
 I've never hit it.

> This probably hurts the performance of front buffer rendering, but
> very few people in their right mind do front buffer rendering.
> 
> Fixes Glean's texture_srgb test.
> 
> Cc: "10.2" <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> Acked-by: Anuj Phogat <anuj.phogat at gmail.com>
> Reviewed-by: Eric Anholt <eric at anholt.net>
> (cherry picked from commit cde8bad1c9363ee293ae7844bcecb6179426ea65)
> 
> ---
> 
>  src/mesa/drivers/dri/i965/intel_buffers.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c
> index f151287..6ad67f1 100644
> --- a/src/mesa/drivers/dri/i965/intel_buffers.c
> +++ b/src/mesa/drivers/dri/i965/intel_buffers.c
> @@ -65,6 +65,7 @@ intelDrawBuffer(struct gl_context * ctx, GLenum mode)
>         * (including the fake front) before we start rendering again.
>         */
>        dri2InvalidateDrawable(brw->driContext->driDrawablePriv);
> +      intel_prepare_render(brw);
>     }
>  }
>  
> @@ -80,6 +81,7 @@ intelReadBuffer(struct gl_context * ctx, GLenum mode)
>         * (including the fake front) before we start reading again.
>         */
>        dri2InvalidateDrawable(brw->driContext->driReadablePriv);
> +      intel_prepare_render(brw);
>     }
>  }
>  
> 
> _______________________________________________
> mesa-commit mailing list
> mesa-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-commit
>