vc4: Enable glSampleMask() even when !rasterizer->multisample.
authorEric Anholt <eric@anholt.net>
Fri, 10 Feb 2017 21:24:37 +0000 (13:24 -0800)
committerEric Anholt <eric@anholt.net>
Fri, 10 Feb 2017 22:17:05 +0000 (14:17 -0800)
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.

src/gallium/drivers/vc4/vc4_program.c

index 536efc4789daf34e1abf470ff746c2cd87136a5a..e6131708c1fb2f12d057f62df7e5e9e4755edcaa 100644 (file)
@@ -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;
         }