From: Eric Anholt <eric@anholt.net>
Date: Fri, 10 Feb 2017 21:24:37 +0000 (-0800)
Subject: vc4: Enable glSampleMask() even when !rasterizer->multisample.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0514b0bdc91e34509f09c27cecc3c3d323967f13;p=mesa.git

vc4: Enable glSampleMask() even when !rasterizer->multisample.

gallium's blitter expects that it can set the sample mask even when the
rasterizer doesn't have the flag on.

Between this and the previous test, 10 new ext_framebuffer_multisample
tests start passing.
---

diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index 536efc4789d..e6131708c1f 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -2699,8 +2699,7 @@ vc4_update_compiled_fs(struct vc4_context *vc4, uint8_t prim_mode)
         }
         if (job->msaa) {
                 key->msaa = vc4->rasterizer->base.multisample;
-                key->sample_coverage = (vc4->rasterizer->base.multisample &&
-                                        vc4->sample_mask != (1 << VC4_MAX_SAMPLES) - 1);
+                key->sample_coverage = (vc4->sample_mask != (1 << VC4_MAX_SAMPLES) - 1);
                 key->sample_alpha_to_coverage = vc4->blend->alpha_to_coverage;
                 key->sample_alpha_to_one = vc4->blend->alpha_to_one;
         }