diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-10-06 10:11:15 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-10-06 19:08:21 +0100 |
| commit | 9fe510ef35a783a244d0d54baa50f959a6b781dc (patch) | |
| tree | 8b42677f94b4388fa7d525beed8d097c3dbc42f5 /src/gallium/drivers/llvmpipe/lp_setup.c | |
| parent | 33f88b3492af1f4f7e78c3688d481f1dee189822 (diff) | |
llvmpipe: Cleanup depth-stencil clears.
Only cosmetic changes. No actual practical difference.
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_setup.c')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_setup.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_setup.c b/src/gallium/drivers/llvmpipe/lp_setup.c index 5ff11a3363..e72ead0def 100644 --- a/src/gallium/drivers/llvmpipe/lp_setup.c +++ b/src/gallium/drivers/llvmpipe/lp_setup.c @@ -377,16 +377,19 @@ lp_setup_try_clear( struct lp_setup_context *setup, } if (flags & PIPE_CLEAR_DEPTHSTENCIL) { - unsigned zmask = (flags & PIPE_CLEAR_DEPTH) ? ~0 : 0; - unsigned smask = (flags & PIPE_CLEAR_STENCIL) ? ~0 : 0; + uint32_t zmask = (flags & PIPE_CLEAR_DEPTH) ? ~0 : 0; + uint32_t smask = (flags & PIPE_CLEAR_STENCIL) ? ~0 : 0; zsvalue = util_pack_z_stencil(setup->fb.zsbuf->format, depth, stencil); - zsmask = util_pack_uint_z_stencil(setup->fb.zsbuf->format, + + zsmask = util_pack_mask_z_stencil(setup->fb.zsbuf->format, zmask, smask); + + zsvalue &= zsmask; } if (setup->state == SETUP_ACTIVE) { @@ -431,7 +434,7 @@ lp_setup_try_clear( struct lp_setup_context *setup, if (flags & PIPE_CLEAR_COLOR) { memcpy(setup->clear.color.clear_color, &color_arg, - sizeof color_arg); + sizeof setup->clear.color.clear_color); } } |