3 files changed, 33 insertions, 1 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index f20e8104fb3..92d37085d1a 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 57254148561..0aa47d55e46 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 098b9218ae5..fb1c1f8c3b4 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