diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-06-03 17:46:14 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-06-03 17:46:14 +0200 |
| commit | 992382762a74fd834926fd2c3cd9e14a186e2dd5 (patch) | |
| tree | c4572bb01331b71931b3570b36a7acfc38f79a68 /src/gallium/drivers/svga/svga_pipe_clear.c | |
| parent | 05863c487756c1c9dc823cf639f77cad4111bd23 (diff) | |
| parent | a6e5c6c000df8655de3b41d5809547bb41c88c23 (diff) | |
Merge branch 'gallium-newclear'
Conflicts:
src/gallium/state_trackers/python/p_context.i
Diffstat (limited to 'src/gallium/drivers/svga/svga_pipe_clear.c')
| -rw-r--r-- | src/gallium/drivers/svga/svga_pipe_clear.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_clear.c b/src/gallium/drivers/svga/svga_pipe_clear.c index cbff95c9179..41f239c1a85 100644 --- a/src/gallium/drivers/svga/svga_pipe_clear.c +++ b/src/gallium/drivers/svga/svga_pipe_clear.c @@ -61,9 +61,11 @@ try_clear(struct svga_context *svga, } if ((buffers & PIPE_CLEAR_DEPTHSTENCIL) && fb->zsbuf) { - flags |= SVGA3D_CLEAR_DEPTH; + if (buffers & PIPE_CLEAR_DEPTH) + flags |= SVGA3D_CLEAR_DEPTH; - if (svga->curr.framebuffer.zsbuf->format == PIPE_FORMAT_S8_USCALED_Z24_UNORM) + if ((svga->curr.framebuffer.zsbuf->format == PIPE_FORMAT_S8_USCALED_Z24_UNORM) && + (buffers & PIPE_CLEAR_STENCIL)) flags |= SVGA3D_CLEAR_STENCIL; rect.w = MAX2(rect.w, fb->zsbuf->width); @@ -100,7 +102,7 @@ svga_clear(struct pipe_context *pipe, unsigned buffers, const float *rgba, { struct svga_context *svga = svga_context( pipe ); int ret; - + if (buffers & PIPE_CLEAR_COLOR) SVGA_DBG(DEBUG_DMA, "clear sid %p\n", svga_surface(svga->curr.framebuffer.cbufs[0])->handle); |