/**************************************************************************
*
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
* All Rights Reserved.
* Copyright 2009 VMware, Inc. All Rights Reserved.
*
* 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.
#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_query.h"
* No masking, no scissor (clear entire buffer).
*/
void
-softpipe_clear(struct pipe_context *pipe, unsigned buffers, const float *rgba,
+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);
- union util_color uc;
- unsigned cv;
+ struct pipe_surface *zsbuf = softpipe->framebuffer.zsbuf;
+ unsigned zs_buffers = buffers & PIPE_CLEAR_DEPTHSTENCIL;
+ uint64_t cv;
uint i;
if (softpipe->no_rast)
if (buffers & PIPE_CLEAR_COLOR) {
for (i = 0; i < softpipe->framebuffer.nr_cbufs; i++) {
- struct pipe_surface *ps = softpipe->framebuffer.cbufs[i];
-
- util_pack_color(rgba, ps->format, &uc);
- sp_tile_cache_clear(softpipe->cbuf_cache[i], rgba, uc.ui);
+ sp_tile_cache_clear(softpipe->cbuf_cache[i], color, 0);
}
}
- if (buffers & PIPE_CLEAR_DEPTHSTENCIL) {
- static const float zero[4] = { 0.0F, 0.0F, 0.0F, 0.0F };
- struct pipe_surface *ps = softpipe->framebuffer.zsbuf;
+ 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_pack_z_stencil(ps->format, depth, stencil);
- sp_tile_cache_clear(softpipe->zsbuf_cache, zero, cv);
+ cv = util_pack64_z_stencil(zsbuf->format, depth, stencil);
+ sp_tile_cache_clear(softpipe->zsbuf_cache, &zero, cv);
}
softpipe->dirty_render_cache = TRUE;