diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-03-23 14:47:33 +0200 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2015-09-30 13:10:03 -0700 |
| commit | a1a3f0961b20907b6948959c1f224bb055bd4f3d (patch) | |
| tree | 9792d09dd62b5f7243febd7f74410cba5d94f75f /src/mesa/drivers/dri/i915 | |
| parent | c349031c27b7f66151f07d785625c585e10a92c2 (diff) | |
| download | external_mesa3d-a1a3f0961b20907b6948959c1f224bb055bd4f3d.zip external_mesa3d-a1a3f0961b20907b6948959c1f224bb055bd4f3d.tar.gz external_mesa3d-a1a3f0961b20907b6948959c1f224bb055bd4f3d.tar.bz2 | |
i915: Remember to call intel_prepare_render() before blitting
Bring over the following fix from i965:
commit fb3d62fe3d4fc40ba4ad9804d8b6f451316c9ae2
Author: Kenneth Graunke <kenneth@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.syrjala@linux.intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: "11.0" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_fbo.c | 5 |
1 files changed, 5 insertions, 0 deletions
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; |