From: Kevin Rogovin <kevin.rogo...@intel.com> Special thanks to Eero Tamminen for reporting rasterizer numbers being twice what it should be for 2xMSAA under a benchmark.
Signed-off-by: Kevin Rogovin <kevin.rogo...@intel.com> --- src/mesa/drivers/dri/i965/intel_screen.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 579554f..67eb776 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1882,7 +1882,7 @@ intel_screen_make_configs(__DRIscreen *dri_screen) }; static const uint8_t singlesample_samples[1] = {0}; - static const uint8_t multisample_samples[2] = {4, 8}; + static const uint8_t multisample_samples_2_4_8_16[] = {2, 4, 8, 16}; struct intel_screen *screen = dri_screen->driverPrivate; const struct gen_device_info *devinfo = &screen->devinfo; @@ -1959,6 +1959,7 @@ intel_screen_make_configs(__DRIscreen *dri_screen) * supported. Singlebuffer configs are not supported because no one wants * them. */ + for (unsigned i = 0; i < ARRAY_SIZE(formats); i++) { if (devinfo->gen < 6) break; @@ -1966,6 +1967,7 @@ intel_screen_make_configs(__DRIscreen *dri_screen) __DRIconfig **new_configs; const int num_depth_stencil_bits = 2; int num_msaa_modes = 0; + const uint8_t *multisample_samples = NULL; depth_bits[0] = 0; stencil_bits[0] = 0; @@ -1978,10 +1980,16 @@ intel_screen_make_configs(__DRIscreen *dri_screen) stencil_bits[1] = 8; } - if (devinfo->gen >= 7) + if (devinfo->gen >= 9) { + multisample_samples = multisample_samples_2_4_8_16; + num_msaa_modes = 4; + } else if (devinfo->gen >= 7) { + multisample_samples = multisample_samples_2_4_8_16 + 1; num_msaa_modes = 2; - else if (devinfo->gen == 6) + } else if (devinfo->gen == 6) { + multisample_samples = multisample_samples_2_4_8_16 + 1; num_msaa_modes = 1; + } new_configs = driCreateConfigs(formats[i], depth_bits, -- 2.7.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev