Mesa (openchrome-branch): openchrome: Fix previous commit.

[Thomas Hellstrom]

Module: Mesa
Branch: openchrome-branch
Commit: 7c8cf77dc5b5f3850ee14ba23d7e710ac1d4578f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c8cf77dc5b5f3850ee14ba23d7e710ac1d4578f

Author: Thomas Hellstrom <thomas-at-shipmail-dot-org>
Date:   Sun Feb 22 21:29:41 2009 +0100

openchrome: Fix previous commit.

---

 src/mesa/drivers/dri/openchrome/via_depthstencil.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/openchrome/via_depthstencil.c b/src/mesa/drivers/dri/openchrome/via_depthstencil.c
index 220c150..8e8637e 100644
--- a/src/mesa/drivers/dri/openchrome/via_depthstencil.c
+++ b/src/mesa/drivers/dri/openchrome/via_depthstencil.c
@@ -164,10 +164,12 @@ static int via_extract_stencil(GLcontext * ctx,
 	goto out_sw;
 
     VIA_FLUSH_DMA(vmesa);
-    viaBlit(vmesa, 24, viaCombinedRb->buf, viaStencilRb->buf, 0, 0,
+    viaBlit(vmesa, 32, viaCombinedRb->buf, viaStencilRb->buf, 0, 0,
 	    viaCombinedRb->pitch, viaStencilRb->pitch, 1, 1,
 	    combinedRb->Width, combinedRb->Height, VIA_BLIT_COPY,
 	    0, 0xe << 28);
+
+    via_execbuf(vmesa, VIA_NO_CLIPRECTS);
     return 0;
   out_sw:
     ret = map_buffers(ctx, viaCombinedRb, viaStencilRb);
@@ -191,11 +193,12 @@ static int via_insert_stencil(GLcontext * ctx,
 	goto out_sw;
 
     VIA_FLUSH_DMA(vmesa);
-    viaBlit(vmesa, 24, viaStencilRb->buf, viaCombinedRb->buf, 0, 0,
+    viaBlit(vmesa, 32, viaStencilRb->buf, viaCombinedRb->buf, 0, 0,
 	    viaStencilRb->pitch, viaCombinedRb->pitch, 1, 1,
 	    combinedRb->Width, combinedRb->Height, VIA_BLIT_COPY,
 	    0, 0xe << 28);
 	
+    via_execbuf(vmesa, VIA_NO_CLIPRECTS);
     return 0;
   out_sw:
     ret = map_buffers(ctx, viaCombinedRb, viaStencilRb);
@@ -332,11 +335,6 @@ via_validate_paired_depth_stencil(GLcontext * ctx, struct gl_framebuffer *fb)
 	if (stencilRb->PairedDepth) {
 	    via_unpair_depth_stencil(ctx, stencilRb);
 	}
-	if (stencilRb->Base._ActualFormat == GL_STENCIL_INDEX8_EXT) {
-	    /* promote buffer to GL_DEPTH24_STENCIL8 for hw rendering */
-	    _mesa_promote_stencil(ctx, &stencilRb->Base);
-	    ASSERT(stencilRb->Base._ActualFormat == GL_DEPTH24_STENCIL8_EXT);
-	}
     }
 
     /* Finally, update the fb->_DepthBuffer and fb->_StencilBuffer fields */