libX11 libxtrans mesa xserver git update 17 dec 2011

2 files changed, 13 insertions, 3 deletions

diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c
index 2817ec12f..803ad2e89 100644
--- a/mesalib/src/mesa/swrast/s_blit.c
+++ b/mesalib/src/mesa/swrast/s_blit.c
@@ -478,7 +478,15 @@ simple_blit(struct gl_context *ctx,
    ASSERT(srcX1 - srcX0 == dstX1 - dstX0);
    ASSERT(srcY1 - srcY0 == dstY1 - dstY0);
 
-   /* determine if copy should be bottom-to-top or top-to-bottom */
+   /* From the GL_ARB_framebuffer_object spec:
+    *
+    *     "If the source and destination buffers are identical, and the source
+    *      and destination rectangles overlap, the result of the blit operation
+    *      is undefined."
+    *
+    * However, we provide the expected result anyway by flipping the order of
+    * the memcpy of rows.
+    */
    if (srcY0 > dstY0) {
       /* src above dst: copy bottom-to-top */
       yStep = 1;
diff --git a/mesalib/src/mesa/swrast/s_drawpix.c b/mesalib/src/mesa/swrast/s_drawpix.c
index b6c433753..7259881c1 100644
--- a/mesalib/src/mesa/swrast/s_drawpix.c
+++ b/mesalib/src/mesa/swrast/s_drawpix.c
@@ -625,7 +625,8 @@ draw_depth_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
                                   GL_DEPTH_STENCIL_EXT, type, i, 0);
 
          if (ctx->Depth.Mask) {
-            if (!scaleOrBias && ctx->DrawBuffer->Visual.depthBits == 24) {
+            if (!scaleOrBias && ctx->DrawBuffer->Visual.depthBits == 24 &&
+		type == GL_UNSIGNED_INT_24_8) {
                /* fast path 24-bit zbuffer */
                GLuint zValues[MAX_WIDTH];
                GLint j;
@@ -639,7 +640,8 @@ draw_depth_stencil_pixels(struct gl_context *ctx, GLint x, GLint y,
                else
                   depthRb->PutRow(ctx, depthRb, width, x, y + i, zValues,NULL);
             }
-            else if (!scaleOrBias && ctx->DrawBuffer->Visual.depthBits == 16) {
+            else if (!scaleOrBias && ctx->DrawBuffer->Visual.depthBits == 16 &&
+		     type == GL_UNSIGNED_INT_24_8) {
                /* fast path 16-bit zbuffer */
                GLushort zValues[MAX_WIDTH];
                GLint j;