Mesa (master): llvmpipe: don't use sample mask with 0 samples

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 50987644834921ecf571d8010960688425e3fda5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=50987644834921ecf571d8010960688425e3fda5

Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Apr  6 16:57:47 2020 +1000

llvmpipe: don't use sample mask with 0 samples

piglit:
spec/arb_sample_shading/builtin-gl-sample-mask 0
spec/arb_sample_shading/builtin-gl-sample-mask-simple 0
CTS:
KHR-GL45.sample_variables.mask.rgba8.samples_0.mask_zero

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

---

 .gitlab-ci/piglit/quick_gl.txt             | 6 ++----
 src/gallium/drivers/llvmpipe/lp_state_fs.c | 8 --------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt
index 74e04837727..2e0134c56bb 100644
--- a/.gitlab-ci/piglit/quick_gl.txt
+++ b/.gitlab-ci/piglit/quick_gl.txt
@@ -523,12 +523,10 @@ spec/arb_sample_shading/builtin-gl-sample-id 16: skip
 spec/arb_sample_shading/builtin-gl-sample-id 32: skip
 spec/arb_sample_shading/builtin-gl-sample-id 6: skip
 spec/arb_sample_shading/builtin-gl-sample-id 8: skip
-spec/arb_sample_shading/builtin-gl-sample-mask 0: fail
 spec/arb_sample_shading/builtin-gl-sample-mask 16: skip
 spec/arb_sample_shading/builtin-gl-sample-mask 32: skip
 spec/arb_sample_shading/builtin-gl-sample-mask 6: skip
 spec/arb_sample_shading/builtin-gl-sample-mask 8: skip
-spec/arb_sample_shading/builtin-gl-sample-mask-simple 0: fail
 spec/arb_sample_shading/builtin-gl-sample-mask-simple 16: skip
 spec/arb_sample_shading/builtin-gl-sample-mask-simple 32: skip
 spec/arb_sample_shading/builtin-gl-sample-mask-simple 6: skip
@@ -1714,8 +1712,8 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    20701
-       fail:      224
+       pass:    20703
+       fail:      222
       crash:        0
        skip:     1465
     timeout:        0
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index c60faece9be..9a6510a8b2c 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -742,15 +742,7 @@ generate_fs_loop(struct gallivm_state *gallivm,
 
       assert(smaski >= 0);
       output_smask = LLVMBuildLoad(builder, outputs[smaski][0], "smask");
-      /*
-       * Pixel is alive according to the first sample in the mask.
-       */
       output_smask = LLVMBuildBitCast(builder, output_smask, smask_bld.vec_type, "");
-      if (!key->multisample) {
-         output_smask = lp_build_and(&smask_bld, output_smask, smask_bld.one);
-         output_smask = lp_build_cmp(&smask_bld, PIPE_FUNC_NOTEQUAL, output_smask, smask_bld.zero);
-         lp_build_mask_update(&mask, output_smask);
-      }
 
       if (key->min_samples > 1) {
          /* only the bit corresponding to this sample is to be used. */