diff options
author | Roland Scheidegger <sroland@vmware.com> | 2010-03-31 16:57:05 +0200 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-31 16:57:05 +0200 |
commit | d97f6963aee71d8fafa2a94a5fe1f3ca4b4ef16d (patch) | |
tree | 4b6fa4c2104dae852616908923d00b723cca082c /src/gallium/auxiliary/gallivm | |
parent | 96bf4aff5bd674bba5d83ab32c46024a686c1a1d (diff) | |
parent | 56b34e54f29cdd0a479219695c6559c44a41a76c (diff) |
Merge branch 'gallium-new-formats'
Conflicts:
src/gallium/auxiliary/util/u_format.csv
src/gallium/auxiliary/util/u_format_access.py
src/gallium/auxiliary/util/u_format_pack.py
Diffstat (limited to 'src/gallium/auxiliary/gallivm')
-rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_depth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_depth.c b/src/gallium/auxiliary/gallivm/lp_bld_depth.c index 4ce1a27a06..c6d0e4bc04 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_depth.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_depth.c @@ -495,8 +495,8 @@ lp_build_depth_stencil_test(LLVMBuilderRef builder, assert(format_desc->block.height == 1); if (stencil[0].enabled) { - assert(format_desc->format == PIPE_FORMAT_Z24S8_UNORM || - format_desc->format == PIPE_FORMAT_S8Z24_UNORM); + assert(format_desc->format == PIPE_FORMAT_Z24_UNORM_S8_USCALED || + format_desc->format == PIPE_FORMAT_S8_USCALED_Z24_UNORM); } assert(z_swizzle < 4); |