diff options
author | Chris Forbes <chrisf@ijw.co.nz> | 2012-11-29 22:24:43 +1300 |
---|---|---|
committer | Chris Forbes <chrisf@ijw.co.nz> | 2013-03-02 11:35:17 +1300 |
commit | 569c4a9f1ca852639a0334b48303a065c7e2447a (patch) | |
tree | e51bfa4e29405bb5f446f19733acc005e1a9446b /src/mesa/drivers/dri/i965/gen6_multisample_state.c | |
parent | 1822496f3a7baf1c1726fda008cb89fbbade5c8d (diff) | |
download | external_mesa3d-569c4a9f1ca852639a0334b48303a065c7e2447a.zip external_mesa3d-569c4a9f1ca852639a0334b48303a065c7e2447a.tar.gz external_mesa3d-569c4a9f1ca852639a0334b48303a065c7e2447a.tar.bz2 |
i965: add support for sample mask on Gen6+
Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_multisample_state.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/gen6_multisample_state.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c index 64ac292..844aad17 100644 --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c @@ -116,7 +116,7 @@ gen6_emit_3dstate_multisample(struct brw_context *brw, void gen6_emit_3dstate_sample_mask(struct brw_context *brw, unsigned num_samples, float coverage, - bool coverage_invert) + bool coverage_invert, unsigned sample_mask) { struct intel_context *intel = &brw->intel; @@ -127,7 +127,7 @@ gen6_emit_3dstate_sample_mask(struct brw_context *brw, uint32_t coverage_bits = (1 << coverage_int) - 1; if (coverage_invert) coverage_bits ^= (1 << num_samples) - 1; - OUT_BATCH(coverage_bits); + OUT_BATCH(coverage_bits & sample_mask); } else { OUT_BATCH(1); } @@ -141,21 +141,28 @@ static void upload_multisample_state(struct brw_context *brw) struct gl_context *ctx = &intel->ctx; float coverage = 1.0; float coverage_invert = false; + unsigned sample_mask = ~0u; /* _NEW_BUFFERS */ unsigned num_samples = ctx->DrawBuffer->Visual.samples; /* _NEW_MULTISAMPLE */ - if (ctx->Multisample._Enabled && ctx->Multisample.SampleCoverage) { - coverage = ctx->Multisample.SampleCoverageValue; - coverage_invert = ctx->Multisample.SampleCoverageInvert; + if (ctx->Multisample._Enabled) { + if (ctx->Multisample.SampleCoverage) { + coverage = ctx->Multisample.SampleCoverageValue; + coverage_invert = ctx->Multisample.SampleCoverageInvert; + } + if (ctx->Multisample.SampleMask) { + sample_mask = ctx->Multisample.SampleMaskValue; + } } /* 3DSTATE_MULTISAMPLE is nonpipelined. */ intel_emit_post_sync_nonzero_flush(intel); gen6_emit_3dstate_multisample(brw, num_samples); - gen6_emit_3dstate_sample_mask(brw, num_samples, coverage, coverage_invert); + gen6_emit_3dstate_sample_mask(brw, num_samples, coverage, + coverage_invert, sample_mask); } |