aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/intel/intel_screen.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_screen.c')
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index e17f18a98f2..4c06170cdf3 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -478,6 +478,7 @@ intelFillInModes(__DRIscreenPrivate *psp,
uint8_t depth_bits_array[3];
uint8_t stencil_bits_array[3];
+ uint8_t msaa_samples_array[1];
depth_bits_array[0] = 0;
depth_bits_array[1] = depth_bits;
@@ -494,6 +495,8 @@ intelFillInModes(__DRIscreenPrivate *psp,
stencil_bits_array[2] = (stencil_bits == 0) ? 8 : stencil_bits;
+ msaa_samples_array[0] = 0;
+
depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 3 : 1;
back_buffer_factor = (have_back_buffer) ? 3 : 1;
@@ -509,7 +512,9 @@ intelFillInModes(__DRIscreenPrivate *psp,
configs = driCreateConfigs(fb_format, fb_type,
depth_bits_array, stencil_bits_array,
depth_buffer_factor, back_buffer_modes,
- back_buffer_factor);
+ back_buffer_factor,
+ msaa_samples_array, 1);
+
if (configs == NULL) {
fprintf(stderr, "[%s:%u] Error creating FBConfig!\n", __func__,
__LINE__);
@@ -679,7 +684,7 @@ __DRIconfig **intelInitScreen2(__DRIscreenPrivate *psp)
static const GLenum back_buffer_modes[] = {
GLX_NONE, GLX_SWAP_UNDEFINED_OML, GLX_SWAP_COPY_OML
};
- uint8_t depth_bits[4], stencil_bits[4];
+ uint8_t depth_bits[4], stencil_bits[4], msaa_samples_array[1];
int color;
const __DRIconfig **configs = NULL;
@@ -730,6 +735,8 @@ __DRIconfig **intelInitScreen2(__DRIscreenPrivate *psp)
depth_bits[3] = 24;
stencil_bits[3] = 8;
+ msaa_samples_array[0] = 0;
+
fb_format[0] = GL_RGB;
fb_type[0] = GL_UNSIGNED_SHORT_5_6_5;
@@ -748,7 +755,9 @@ __DRIconfig **intelInitScreen2(__DRIscreenPrivate *psp)
stencil_bits,
ARRAY_SIZE(depth_bits),
back_buffer_modes,
- ARRAY_SIZE(back_buffer_modes));
+ ARRAY_SIZE(back_buffer_modes),
+ msaa_samples_array, ARRAY_SIZE(msaa_samples_array));
+
if (configs == NULL)
configs = new_configs;
else