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 <eric@anholt.net>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>

diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index f24f976f3476ff7f5e37e223d1262d63219ffed2..8bda7ff7e0e71170e22ba66b7786b10b399729ff 100644 (file)
--- 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;