summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2014-05-05 11:02:18 -0700
committerIan Romanick <ian.d.romanick@intel.com>2014-05-07 09:48:34 -0700
commita1dd1e62fa911a593cca354349e43149bd5f6e45 (patch)
tree45b072046269447a27da53026445cc99e2b83648
parentc7a3c2d29d74a96ac8461ec06ca8b9e0b957a994 (diff)
i965: Always intel_prepare_render() after invalidating front buffers.
Fixes glean/texture_srgb, which hit recursive-flush prevention assertions in vbo_exec_FlushVertices. 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@lists.freedesktop.org> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit cde8bad1c9363ee293ae7844bcecb6179426ea65)
-rw-r--r--src/mesa/drivers/dri/i965/intel_buffers.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c
index f1512872c3b..6ad67f1a63e 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);
}
}