s/Tungsten Graphics/VMware/

[mesa.git] / src / gallium / drivers / softpipe / sp_clear.c

diff --git a/src/gallium/drivers/softpipe/sp_clear.c b/src/gallium/drivers/softpipe/sp_clear.c
index 39aed151c73f1a2d5221c3a5acf2b146f6f22563..ba04fd0aa873a0b32e1812dc96526bf23dad21ae 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_clear.c
+++ b/src/gallium/drivers/softpipe/sp_clear.c
@@ -1,7 +1,8 @@
 /**************************************************************************
  * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
  * All Rights Reserved.
+ * Copyright 2009 VMware, Inc.  All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
@@ -18,7 +19,7 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -27,49 +28,63 @@
 
 /* Author:
  *    Brian Paul
+ *    Michel Dänzer
  */
 
 
 #include "pipe/p_defines.h"
+#include "util/u_pack_color.h"
+#include "util/u_surface.h"
 #include "sp_clear.h"
 #include "sp_context.h"
-#include "sp_surface.h"
-#include "sp_state.h"
+#include "sp_query.h"
 #include "sp_tile_cache.h"
 
 
 /**
- * Clear the given surface to the specified value.
+ * Clear the given buffers to the specified values.
  * No masking, no scissor (clear entire buffer).
  */
 void
-softpipe_clear(struct pipe_context *pipe, struct pipe_surface *ps,
-               unsigned clearValue)
+softpipe_clear(struct pipe_context *pipe, unsigned buffers,
+               const union pipe_color_union *color,
+               double depth, unsigned stencil)
 {
    struct softpipe_context *softpipe = softpipe_context(pipe);
+   struct pipe_surface *zsbuf = softpipe->framebuffer.zsbuf;
+   unsigned zs_buffers = buffers & PIPE_CLEAR_DEPTHSTENCIL;
+   uint64_t cv;
    uint i;
 
-#if 0
-   softpipe_update_derived(softpipe); /* not needed?? */
-#endif
+   if (softpipe->no_rast)
+      return;
 
-   if (ps == sp_tile_cache_get_surface(softpipe->zsbuf_cache)) {
-      sp_tile_cache_clear(softpipe->zsbuf_cache, clearValue);
-      softpipe->framebuffer.zsbuf->status = PIPE_SURFACE_STATUS_CLEAR;
-#if TILE_CLEAR_OPTIMIZATION
+   if (!softpipe_check_render_cond(softpipe))
       return;
+
+#if 0
+   softpipe_update_derived(softpipe, PIPE_PRIM_TRIANGLES); /* not needed?? */
 #endif
-   }
 
-   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);
-         softpipe->framebuffer.cbufs[i]->status = PIPE_SURFACE_STATUS_CLEAR;
+   if (buffers & PIPE_CLEAR_COLOR) {
+      for (i = 0; i < softpipe->framebuffer.nr_cbufs; i++) {
+         sp_tile_cache_clear(softpipe->cbuf_cache[i], color, 0);
       }
    }
 
-#if !TILE_CLEAR_OPTIMIZATION
-   /* non-cached surface */
-   pipe->surface_fill(pipe, ps, 0, 0, ps->width, ps->height, clearValue);
-#endif
+   if (zs_buffers &&
+       util_format_is_depth_and_stencil(zsbuf->texture->format) &&
+       zs_buffers != PIPE_CLEAR_DEPTHSTENCIL) {
+      /* Clearing only depth or stencil in a combined depth-stencil buffer. */
+      util_clear_depth_stencil(pipe, zsbuf, zs_buffers, depth, stencil,
+                               0, 0, zsbuf->width, zsbuf->height);
+   }
+   else if (zs_buffers) {
+      static const union pipe_color_union zero;
+
+      cv = util_pack64_z_stencil(zsbuf->format, depth, stencil);
+      sp_tile_cache_clear(softpipe->zsbuf_cache, &zero, cv);
+   }
+
+   softpipe->dirty_render_cache = TRUE;
 }