summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-09 11:16:20 -0700
committerBrian Paul <brianp@vmware.com>2009-02-09 11:16:20 -0700
commite13593678f62941db06b7ae1a21b81c643371659 (patch)
tree0d08b544c147ef08fa01a6c8fe3c9ae6efc78e7c /src/mesa/drivers/dri/intel
parent22c6c1eaad49692416f45bcbbcdc6424aea2da7c (diff)
re-add MSAA support
(cherry picked from commit f7d80aa00611917bc8ce637136d982b151b8f44f) This also involved adding the new MSAA fields to driCreateConfigs(). Also, re-add prog_instructions->Sampler field for i965 driver. Will have to revisit that.
Diffstat (limited to 'src/mesa/drivers/dri/intel')
-rw-r--r--src/mesa/drivers/dri/intel/intel_screen.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index e17f18a98f..f29e0e966b 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;
@@ -509,7 +510,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 +682,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;
@@ -748,7 +751,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