From 6c5f371a27f901d5bc60cf5a2a11cf6629f96f78 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Mon, 7 Sep 2015 18:23:14 +0100 Subject: [PATCH] i965/skl+: Enable support for 16x multisampling Reviewed-by: Ben Widawsky --- 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 3b125448e14..ac6045dbba9 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -84,6 +84,12 @@ brw_query_samples_for_format(struct gl_context *ctx, GLenum target, switch (brw->gen) { case 9: + samples[0] = 16; + samples[1] = 8; + samples[2] = 4; + samples[3] = 2; + return 4; + case 8: 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 fb95fb629ad..d64ebade769 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1178,12 +1178,15 @@ intel_detect_timestamp(struct intel_screen *screen) const int* intel_supported_msaa_modes(const struct intel_screen *screen) { + static const int gen9_modes[] = {16, 8, 4, 2, 0, -1}; 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 >= 8) { + if (screen->devinfo->gen >= 9) { + return gen9_modes; + } else if (screen->devinfo->gen >= 8) { return gen8_modes; } else if (screen->devinfo->gen >= 7) { return gen7_modes; -- 2.30.2