From: Paul Berry Date: Wed, 18 Jul 2012 04:06:01 +0000 (-0700) Subject: i965/msaa: Remove assertion in 3DSTATE_SAMPLE_MASK to allow 8x MSAA. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=304be9db1437b9c7cb4ea17f2a05aa50b6483dc9;p=mesa.git i965/msaa: Remove assertion in 3DSTATE_SAMPLE_MASK to allow 8x MSAA. The code to emit 3DSTATE_SAMPLE_MASK was already correct for 8x MSAA--this patch just removes an assertion that would have prevented it from being used for 8x MSAA. Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/gen6_multisample_state.c b/src/mesa/drivers/dri/i965/gen6_multisample_state.c index b8201a6767b..68d28dd9b45 100644 --- a/src/mesa/drivers/dri/i965/gen6_multisample_state.c +++ b/src/mesa/drivers/dri/i965/gen6_multisample_state.c @@ -119,9 +119,6 @@ gen6_emit_3dstate_sample_mask(struct brw_context *brw, { struct intel_context *intel = &brw->intel; - /* TODO: 8x MSAA not implemented */ - assert(num_samples <= 4); - BEGIN_BATCH(2); OUT_BATCH(_3DSTATE_SAMPLE_MASK << 16 | (2 - 2)); if (num_samples > 0) {