Merge commit 'origin/7.8'

[mesa.git] / src / gallium / auxiliary / gallivm / lp_bld_depth.c

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_depth.c b/src/gallium/auxiliary/gallivm/lp_bld_depth.c
index 4ce1a27a061efb628471c923f79b5a07491093c4..564ea2e3189e68dad9fa2b9e5a1497617fb15b81 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_depth.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_depth.c
@@ -116,7 +116,7 @@ lp_build_stencil_test_single(struct lp_build_context *bld,
       stencilVals = LLVMBuildAnd(bld->builder, stencilVals, valuemask, "");
    }
 
-   res = lp_build_cmp(bld, stencil->func, stencilVals, stencilRef);
+   res = lp_build_cmp(bld, stencil->func, stencilRef, stencilVals);
 
    return res;
 }
@@ -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);