diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-19 12:11:26 +0200 |
| commit | 1e90ede4237374dfbb2c8c506a906233bcfd3c5d (patch) | |
| tree | 13b59b0ab2715fd0bb9eea788c73b08f3b07c01e /mesalib/src/gallium/auxiliary/util/u_surface.c | |
| parent | baf98f9bb36f956245d83ecd04f90625d6d68d2b (diff) | |
| parent | 9f986778bd4393c5a9108426969d45aa7f10f334 (diff) | |
| download | vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.gz vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.tar.bz2 vcxsrv-1e90ede4237374dfbb2c8c506a906233bcfd3c5d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/os.h
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_surface.c')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_surface.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_surface.c b/mesalib/src/gallium/auxiliary/util/u_surface.c index 308511b33..c7fbd3657 100644 --- a/mesalib/src/gallium/auxiliary/util/u_surface.c +++ b/mesalib/src/gallium/auxiliary/util/u_surface.c @@ -311,7 +311,7 @@ util_clear_depth_stencil(struct pipe_context *pipe, switch (util_format_get_blocksize(dst->format)) { case 1: - assert(dst->format == PIPE_FORMAT_S8_USCALED); + assert(dst->format == PIPE_FORMAT_S8_UINT); if(dst_stride == width) memset(dst_map, (ubyte) zstencil, height * width); else { @@ -341,10 +341,10 @@ util_clear_depth_stencil(struct pipe_context *pipe, } else { uint32_t dst_mask; - if (dst->format == PIPE_FORMAT_Z24_UNORM_S8_USCALED) + if (dst->format == PIPE_FORMAT_Z24_UNORM_S8_UINT) dst_mask = 0xffffff00; else { - assert(dst->format == PIPE_FORMAT_S8_USCALED_Z24_UNORM); + assert(dst->format == PIPE_FORMAT_S8_UINT_Z24_UNORM); dst_mask = 0xffffff; } if (clear_flags & PIPE_CLEAR_DEPTH) @@ -364,7 +364,7 @@ util_clear_depth_stencil(struct pipe_context *pipe, uint64_t zstencil = util_pack64_z_stencil(dst->texture->format, depth, stencil); - assert(dst->format == PIPE_FORMAT_Z32_FLOAT_S8X24_USCALED); + assert(dst->format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT); if (!need_rmw) { for (i = 0; i < height; i++) { |