From: Dave Airlie <airlied@redhat.com>
Date: Fri, 20 Mar 2020 20:47:31 +0000 (+1000)
Subject: llvmpipe: don't allow branch to end for early Z with multisample
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=367332b0fce4a613676c0e6ea44c58b2c9c3b558;p=mesa.git

llvmpipe: don't allow branch to end for early Z with multisample

Don't allow the branching optimisation with multisample enabled
as we have to check all samples.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>
---

diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 79a8cc1fe1a..8c3fc05fa04 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -570,7 +570,7 @@ generate_fs_loop(struct gallivm_state *gallivm,
                                   z, z_fb, s_fb,
                                   facing,
                                   &z_value, &s_value,
-                                  !simple_shader);
+                                  !simple_shader && !key->multisample);
 
       if (depth_mode & EARLY_DEPTH_WRITE) {
          lp_build_depth_stencil_write_swizzled(gallivm, type,