Module: Mesa Branch: master Commit: a1a3f0961b20907b6948959c1f224bb055bd4f3d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1a3f0961b20907b6948959c1f224bb055bd4f3d
Author: Ville Syrjälä <ville.syrj...@linux.intel.com> Date: Mon Mar 23 14:47:33 2015 +0200 i915: Remember to call intel_prepare_render() before blitting Bring over the following fix from i965: commit fb3d62fe3d4fc40ba4ad9804d8b6f451316c9ae2 Author: Kenneth Graunke <kenn...@whitecape.org> 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ä <ville.syrj...@linux.intel.com> Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> Cc: "11.0" <mesa-sta...@lists.freedesktop.org> --- 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 6701366..12cc7e3 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; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit