void
gen8_emit_3dstate_multisample(struct brw_context *brw, unsigned num_samples)
{
- uint32_t number_of_multisamples = 0;
+ assert(num_samples <= 16);
- switch (num_samples) {
- case 0:
- case 1:
- number_of_multisamples = MS_NUMSAMPLES_1;
- break;
- case 2:
- number_of_multisamples = MS_NUMSAMPLES_2;
- break;
- case 4:
- number_of_multisamples = MS_NUMSAMPLES_4;
- break;
- case 8:
- number_of_multisamples = MS_NUMSAMPLES_8;
- break;
- case 16:
- number_of_multisamples = MS_NUMSAMPLES_16;
- break;
- default:
- assert(!"Unrecognized num_samples in gen8_emit_3dstate_multisample");
- break;
- }
+ unsigned log2_samples = ffs(MAX2(num_samples, 1)) - 1;
BEGIN_BATCH(2);
OUT_BATCH(GEN8_3DSTATE_MULTISAMPLE << 16 | (2 - 2));
- OUT_BATCH(MS_PIXEL_LOCATION_CENTER | number_of_multisamples);
+ OUT_BATCH(MS_PIXEL_LOCATION_CENTER | log2_samples << 1);
ADVANCE_BATCH();
}
static void
upload_multisample_state(struct brw_context *brw)
{
- struct gl_context *ctx = &brw->ctx;
-
- /* _NEW_BUFFERS, _NEW_MULTISAMPLE */
- unsigned num_samples = ctx->DrawBuffer->Visual.samples;
-
- gen8_emit_3dstate_multisample(brw, num_samples);
+ gen8_emit_3dstate_multisample(brw, brw->num_samples);
gen6_emit_3dstate_sample_mask(brw, gen6_determine_sample_mask(brw));
}
const struct brw_tracked_state gen8_multisample_state = {
.dirty = {
- .mesa = _NEW_BUFFERS | _NEW_MULTISAMPLE,
- .brw = BRW_NEW_CONTEXT,
- .cache = 0
+ .mesa = _NEW_MULTISAMPLE,
+ .brw = BRW_NEW_CONTEXT |
+ BRW_NEW_NUM_SAMPLES,
},
.emit = upload_multisample_state
};