Module: Mesa Branch: master Commit: 87d6b359745b6b2c94d1c852ce27e2879d4bec56 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=87d6b359745b6b2c94d1c852ce27e2879d4bec56
Author: Chad Versace <chad.vers...@linux.intel.com> Date: Thu Nov 10 11:04:17 2011 -0800 intel: Fix intel_unmap_renderbuffer_s8() When gathering the temporary buffer's pixles into the gem buffer, we had the two buffers juxtaposed. Oops. Fixes the following Piglit tests on gen7: general/GL_SELECT - alpha-test enabled general/GL_SELECT - depth-test enabled general/GL_SELECT - no test function general/GL_SELECT - scissor-test enabled general/GL_SELECT - stencil-test enabled Fixes SIGABRT in Piglit tests EXT_framebuffer_object/fbo-stencil-* on gen7. Reviewed-by: Eric Anholt <e...@anholt.net> Signed-off-by: Chad Versace <chad.vers...@linux.intel.com> --- src/mesa/drivers/dri/intel/intel_fbo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index f24f976..8bda7ff 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -349,8 +349,8 @@ intel_unmap_renderbuffer_s8(struct gl_context *ctx, /* The temporary buffer was written to, so we must copy its pixels into * the real buffer. */ - uint8_t *tiled_s8_map = irb->map_buffer; - uint8_t *untiled_s8_map = irb->region->bo->virtual; + uint8_t *untiled_s8_map = irb->map_buffer; + uint8_t *tiled_s8_map = irb->region->bo->virtual; /* Flip the Y axis for the default framebuffer. */ int y_flip = (rb->Name == 0) ? -1 : 1; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit