6 files changed, 66 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.c b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
index c03c009a3a..fb93151430 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_buffers.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_buffers.c
@@ -40,6 +40,7 @@
 #include "swrast/swrast.h"
 #include "vblank.h"
 
+#include "pipe/p_context.h"
 
 /* This block can be removed when libdrm >= 2.3.1 is required */
 
@@ -298,9 +299,17 @@ intelWindowMoved(struct intel_context *intel)
 /**
  * Called by ctx->Driver.Clear.
  */
+#if 0
 static void
 intelClear(GLcontext *ctx, GLbitfield mask)
+#else
+void
+intelClear(struct pipe_context *pipe,
+           GLboolean color, GLboolean depth,
+           GLboolean stencil, GLboolean accum)
+#endif
 {
+   GLcontext *ctx = (GLcontext *) pipe->glctx;
    const GLuint colorMask = *((GLuint *) & ctx->Color.ColorMask);
    GLbitfield tri_mask = 0;
    GLbitfield blit_mask = 0;
@@ -308,6 +317,13 @@ intelClear(GLcontext *ctx, GLbitfield mask)
    struct gl_framebuffer *fb = ctx->DrawBuffer;
    GLuint i;
 
+   GLbitfield mask;
+
+   if (color)
+      mask = ctx->DrawBuffer->_ColorDrawBufferMask[0]; /*XXX temporary*/
+   else
+      mask = 0x0;
+
    if (0)
       fprintf(stderr, "%s\n", __FUNCTION__);
 
@@ -323,7 +339,7 @@ intelClear(GLcontext *ctx, GLbitfield mask)
    }
 
    /* HW stencil */
-   if (mask & BUFFER_BIT_STENCIL) {
+   if (stencil) {
       const struct pipe_region *stencilRegion
          = intel_get_rb_region(fb, BUFFER_STENCIL);
       if (stencilRegion) {
@@ -340,7 +356,7 @@ intelClear(GLcontext *ctx, GLbitfield mask)
    }
 
    /* HW depth */
-   if (mask & BUFFER_BIT_DEPTH) {
+   if (depth) {
       /* clear depth with whatever method is used for stencil (see above) */
       if (tri_mask & BUFFER_BIT_STENCIL)
          tri_mask |= BUFFER_BIT_DEPTH;
@@ -368,9 +384,14 @@ intelClear(GLcontext *ctx, GLbitfield mask)
    if (blit_mask)
       intelClearWithBlit(ctx, blit_mask);
 
-#if 1
+#if 0
    if (swrast_mask | tri_mask)
       _swrast_Clear(ctx, swrast_mask | tri_mask);
+#else
+   softpipe_clear(pipe, GL_FALSE,
+                  (swrast_mask | tri_mask) & BUFFER_BIT_DEPTH,
+                  (swrast_mask | tri_mask) & BUFFER_BIT_STENCIL,
+                  (swrast_mask | tri_mask) & BUFFER_BIT_ACCUM);
 #endif
 }
 
@@ -786,7 +807,9 @@ intelReadBuffer(GLcontext * ctx, GLenum mode)
 void
 intelInitBufferFuncs(struct dd_function_table *functions)
 {
+#if 0
    functions->Clear = intelClear;
+#endif
    functions->DrawBuffer = intelDrawBuffer;
    functions->ReadBuffer = intelReadBuffer;
 }
diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.h b/src/mesa/drivers/dri/i915pipe/intel_buffers.h
index 5834e39501..f0602eebae 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_buffers.h
+++ b/src/mesa/drivers/dri/i915pipe/intel_buffers.h
@@ -52,4 +52,9 @@ extern void intel_draw_buffer(GLcontext * ctx, struct gl_framebuffer *fb);
 
 extern void intelInitBufferFuncs(struct dd_function_table *functions);
 
+extern void
+intelClear(struct pipe_context *pipe,
+           GLboolean color, GLboolean depth,
+           GLboolean stencil, GLboolean accum);
+
 #endif /* INTEL_BUFFERS_H */
diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.c b/src/mesa/drivers/dri/i915pipe/intel_context.c
index 0ccd22a4d0..6121f6bc60 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_context.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_context.c
@@ -420,6 +420,8 @@ intelCreateContext(const __GLcontextModes * mesaVis,
    
    intel->pipe = intel->ctx.st->pipe;
    intel->pipe->screen = intelScreen;
+   intel->pipe->glctx = ctx;
+   intel->pipe->clear = intelClear;
    intelScreen->pipe = intel->pipe;
    intel_init_region_functions(intel->pipe);
 
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index f20e8104fb..92d37085d1 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -82,6 +82,7 @@
 #include "drivers/common/driverfuncs.h"
 
 #include "state_tracker/st_public.h"
+#include "state_tracker/st_context.h"
 #include "pipe/softpipe/sp_context.h"
 
 /**
@@ -1572,6 +1573,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
 
    st_create_context( mesaCtx,
 		      softpipe_create() );
+   mesaCtx->st->pipe->clear = xmesa_clear;
    
    return c;
 }
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index 5725414856..0aa47d55e4 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -435,6 +435,32 @@ clear_buffers(GLcontext *ctx, GLbitfield buffers)
 }
 
 
+void
+xmesa_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
+            GLboolean stencil, GLboolean accum)
+{
+   struct softpipe_context *sp = (struct softpipe_context *) pipe;
+   if (color) {
+      GET_CURRENT_CONTEXT(ctx);
+      GLuint i;
+      softpipe_update_derived(sp);
+      for (i = 0; i < sp->framebuffer.num_cbufs; i++) {
+         struct pipe_surface *ps = sp->framebuffer.cbufs[i];
+         struct xmesa_renderbuffer *xrb = (struct xmesa_renderbuffer *) ps->rb;
+         const GLint x = sp->cliprect.minx;
+         const GLint y = sp->cliprect.miny;
+         const GLint w = sp->cliprect.maxx - x;
+         const GLint h = sp->cliprect.maxy - y;
+         xrb->clearFunc(ctx, xrb, x, y, w, h);
+      }
+      color = GL_FALSE;
+   }
+
+   softpipe_clear(pipe, color, depth, stencil, accum);
+}
+
+
+
 #ifndef XFree86Server
 /* XXX this was never tested in the Xserver environment */
 
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 098b9218ae..fb1c1f8c3b 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -587,9 +587,13 @@ extern void xmesa_register_swrast_functions( GLcontext *ctx );
 
 
 struct pipe_surface;
+struct pipe_context;
 
-struct pipe_surface *
+extern struct pipe_surface *
 xmesa_new_surface(GLcontext *ctx, struct xmesa_renderbuffer *xrb);
 
+extern void
+xmesa_clear(struct pipe_context *pipe, GLboolean color, GLboolean depth,
+            GLboolean stencil, GLboolean accum);
 
 #endif