From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 16 Jan 2019 07:22:48 +0000 (-0800)
Subject: iris: Allow sample mask of 0
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b336a15139f30dcfa1a7f8191153807609860c3;p=mesa.git

iris: Allow sample mask of 0

I think this was an attempt to work around various sample mask bugs I
had early on.  It's not correct.  A sample mask of 0 is legal and means
to disable all samples.

Fixes dEQP-GLES31.functional.texture.multisample.*.*sample_mask*
---

diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index 74a84e5065c..e77c991ecc1 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -4316,7 +4316,7 @@ iris_upload_dirty_render_state(struct iris_context *ice,
 
    if (dirty & IRIS_DIRTY_SAMPLE_MASK) {
       iris_emit_cmd(batch, GENX(3DSTATE_SAMPLE_MASK), ms) {
-         ms.SampleMask = MAX2(ice->state.sample_mask, 1);
+         ms.SampleMask = ice->state.sample_mask;
       }
    }