diff options
| author | Dave Airlie <[email protected]> | 2013-03-04 06:17:11 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2013-04-11 21:09:29 +0100 |
| commit | f152da6bf990c330108da25972f28e08b2f233aa (patch) | |
| tree | 2f4facdaca58bacf07360f82d45bcd0aa8fe47ec /src/mesa/state_tracker/st_atom_msaa.c | |
| parent | 1d90ee5ef500e604267439557f99d94b49d7fbb6 (diff) | |
st/mesa: add support for ARB_texture_multisample (v3)
This adds support to the mesa state tracker for ARB_texture_multisample.
hardware doesn't seem to use a different texture instructions, so
I don't think we need to create one for TGSI at this time.
Thanks to Marek for fixes to sample number picking.
v2: idr pointed out a bug in how we picked the max sample counts,
use new internal format chooser interface to pick proper answers.
v3: use st_choose_format directly, it was okay, fix anding of masks.
Reviewed-by: Marek Olšák <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker/st_atom_msaa.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_msaa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_msaa.c b/src/mesa/state_tracker/st_atom_msaa.c index 9baa4fcf2eb..fb760460c57 100644 --- 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? */ |