st/mesa: add support for ARB_texture_multisample (v3)

[mesa.git] / src / mesa / state_tracker / st_atom_msaa.c

diff --git a/src/mesa/state_tracker/st_atom_msaa.c b/src/mesa/state_tracker/st_atom_msaa.c
index 9baa4fcf2eb9fa2f06ee27223b49c11a18484b3b..fb760460c5738bfdca3f888fa638d57f9e5d8b05 100644 (file)
--- a/src/mesa/state_tracker/st_atom_msaa.c
+++ b/src/mesa/state_tracker/st_atom_msaa.c
@@ -62,7 +62,8 @@ static void update_sample_mask( struct st_context *st )
          if (st->ctx->Multisample.SampleCoverageInvert)
             sample_mask = ~sample_mask;
       }
-      /* TODO merge with app-supplied sample mask */
+      if (st->ctx->Multisample.SampleMask)
+         sample_mask &= st->ctx->Multisample.SampleMaskValue;
    }
 
    /* mask off unused bits or don't care? */