From 569c4a9f1ca852639a0334b48303a065c7e2447a Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 29 Nov 2012 22:24:43 +1300 Subject: [PATCH] i965: add support for sample mask on Gen6+ Signed-off-by: Chris Forbes Reviewed-by: Eric Anholt Reviewed-by: Paul Berry Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/brw_context.h | 2 +- src/mesa/drivers/dri/i965/gen6_blorp.cpp | 2 +- src/mesa/drivers/dri/i965/gen6_multisample_state.c | 19 +++++++++++++------ src/mesa/drivers/dri/i965/gen7_blorp.cpp | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index c173e49..9758cfc 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1229,7 +1229,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); /* gen7_urb.c */ void diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp index 2b6db82..56e8994 100644 --- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp @@ -1041,7 +1041,7 @@ gen6_blorp_exec(struct intel_context *intel, uint32_t prog_offset = params->get_wm_prog(brw, &prog_data); gen6_blorp_emit_batch_head(brw, params); gen6_emit_3dstate_multisample(brw, params->num_samples); - gen6_emit_3dstate_sample_mask(brw, params->num_samples, 1.0, false); + gen6_emit_3dstate_sample_mask(brw, params->num_samples, 1.0, false, ~0u); gen6_blorp_emit_state_base_address(brw, params); gen6_blorp_emit_vertices(brw, params); gen6_blorp_emit_urb_config(brw, params); 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); } diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp index b6719b7..2730532 100644 --- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp +++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp @@ -748,7 +748,7 @@ gen7_blorp_exec(struct intel_context *intel, gen6_blorp_emit_batch_head(brw, params); gen7_allocate_push_constants(brw); gen6_emit_3dstate_multisample(brw, params->num_samples); - gen6_emit_3dstate_sample_mask(brw, params->num_samples, 1.0, false); + gen6_emit_3dstate_sample_mask(brw, params->num_samples, 1.0, false, ~0u); gen6_blorp_emit_state_base_address(brw, params); gen6_blorp_emit_vertices(brw, params); gen7_blorp_emit_urb_config(brw, params); -- 2.7.4