From 57405605a8c320f9d6ea389afd43ce6f013330a5 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 10 Feb 2014 11:42:47 -0800 Subject: [PATCH] i965: Actually claim to support MSAA on Broadwell. We need to advertise 8x, 4x, and 2x multisamples. Previously, we only claimed to support 0/1 samples. Signed-off-by: Kenneth Graunke Reviewed-by: Eric Anholt Reviewed-by: Anuj Phogat --- src/mesa/drivers/dri/i965/brw_context.c | 6 ++++++ src/mesa/drivers/dri/i965/intel_screen.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index bb194a74406..580009248a7 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -79,6 +79,12 @@ brw_query_samples_for_format(struct gl_context *ctx, GLenum target, (void) target; switch (brw->gen) { + case 8: + samples[0] = 8; + samples[1] = 4; + samples[2] = 2; + return 3; + case 7: samples[0] = 8; samples[1] = 4; diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index ba229714007..b5b0294c8a0 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1111,11 +1111,14 @@ intel_detect_swizzling(struct intel_screen *screen) const int* intel_supported_msaa_modes(const struct intel_screen *screen) { + static const int gen8_modes[] = {8, 4, 2, 0, -1}; static const int gen7_modes[] = {8, 4, 0, -1}; static const int gen6_modes[] = {4, 0, -1}; static const int gen4_modes[] = {0, -1}; - if (screen->devinfo->gen >= 7) { + if (screen->devinfo->gen >= 8) { + return gen8_modes; + } else if (screen->devinfo->gen >= 7) { return gen7_modes; } else if (screen->devinfo->gen == 6) { return gen6_modes; -- 2.30.2