From a1a3f0961b20907b6948959c1f224bb055bd4f3d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Mon, 23 Mar 2015 14:47:33 +0200 Subject: [PATCH] i915: Remember to call intel_prepare_render() before blitting MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Bring over the following fix from i965: commit fb3d62fe3d4fc40ba4ad9804d8b6f451316c9ae2 Author: Kenneth Graunke Date: Tue Aug 6 14:36:09 2013 -0700 i965: Remember to call intel_prepare_render() before blitting. Fixes a crash in the following piglit tests: bin/fbo-sys-blit -auto bin/fbo-sys-sub-blit -auto Signed-off-by: Ville Syrjälä Reviewed-by: Ian Romanick Cc: "11.0" --- src/mesa/drivers/dri/i915/intel_fbo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mesa/drivers/dri/i915/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c index 67013666377..12cc7e3a71b 100644 --- a/src/mesa/drivers/dri/i915/intel_fbo.c +++ b/src/mesa/drivers/dri/i915/intel_fbo.c @@ -658,6 +658,11 @@ intel_blit_framebuffer_with_blitter(struct gl_context *ctx, { struct intel_context *intel = intel_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(intel); + if (mask & GL_COLOR_BUFFER_BIT) { GLint i; struct gl_renderbuffer *src_rb = readFb->_ColorReadBuffer; -- 2.30.2