1 files changed, 15 insertions, 26 deletions
diff --git a/src/mesa/pipe/softpipe/sp_clear.c b/src/mesa/pipe/softpipe/sp_clear.c
index 87f850b6fd..5b3857145d 100644
--- a/src/mesa/pipe/softpipe/sp_clear.c
+++ b/src/mesa/pipe/softpipe/sp_clear.c
@@ -47,39 +47,28 @@ softpipe_clear(struct pipe_context *pipe, struct pipe_surface *ps,
                unsigned clearValue)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
-   unsigned x, y, w, h;
+   uint i;
 
+#if 0
    softpipe_update_derived(softpipe); /* not needed?? */
+#endif
 
-   /* Use the X coord to trick region_fill() into filling at an offset
-    * from the start of the region.  Perhaps pipe_region should have the
-    * 'offset' field, not pipe_surface???
-    */
-   assert(ps->offset % ps->region->cpp == 0);
-   x = ps->offset / ps->region->cpp;
-   y = 0;
-   w = ps->width;
-   h = ps->height;
-
-   assert(w <= ps->region->pitch);
-   assert(h <= ps->region->height);
-
+#if TILE_CLEAR_OPTIMIZATION
    if (ps == sp_tile_cache_get_surface(softpipe->zbuf_cache)) {
-      float clear[4];
-      clear[0] = 1.0; /* XXX hack */
-      sp_tile_cache_clear(softpipe->zbuf_cache, clear);
-   }
-   else if (ps == sp_tile_cache_get_surface(softpipe->cbuf_cache[0])) {
-      float clear[4];
-      clear[0] = 0.2f; /* XXX hack */
-      clear[1] = 0.2f; /* XXX hack */
-      clear[2] = 0.2f; /* XXX hack */
-      clear[3] = 0.2f; /* XXX hack */
-      sp_tile_cache_clear(softpipe->cbuf_cache[0], clear);
+      sp_tile_cache_clear(softpipe->zbuf_cache, clearValue);
+      return;
    }
 
-   pipe->region_fill(pipe, ps->region, 0, x, y, w, h, clearValue);
+   for (i = 0; i < softpipe->framebuffer.num_cbufs; i++) {
+      if (ps == sp_tile_cache_get_surface(softpipe->cbuf_cache[i])) {
+         sp_tile_cache_clear(softpipe->cbuf_cache[i], clearValue);
+         return;
+      }
+   }
+#endif
 
+   /* non-cached surface */
+   pipe->surface_fill(pipe, ps, 0, 0, ps->width, ps->height, clearValue);
 
 #if 0
    sp_clear_tile_cache(ps, clearValue);