Mesa (master): dri: Properly calculate number of modes for MSAA.

Corbin Simpson csimpson at kemper.freedesktop.org
Mon Jan 18 09:13:38 UTC 2010


Module: Mesa
Branch: master
Commit: c273ab007dc4194b62965c3b1d9c8a90ea573680
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c273ab007dc4194b62965c3b1d9c8a90ea573680

Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date:   Mon Jan 18 00:36:04 2010 -0800

dri: Properly calculate number of modes for MSAA.

Split from the next patch for bisection purposes only.

---

 src/gallium/state_trackers/dri/dri_screen.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
index 793db08..d9f1fd4 100644
--- a/src/gallium/state_trackers/dri/dri_screen.c
+++ b/src/gallium/state_trackers/dri/dri_screen.c
@@ -158,7 +158,7 @@ dri_fill_in_modes(struct dri_screen *screen,
 				 depth_bits_array, stencil_bits_array,
 				 depth_buffer_factor, back_buffer_modes,
 				 back_buffer_factor,
-				 msaa_samples_array, 1);
+				 msaa_samples_array, msaa_samples_factor);
    } else {
       __DRIconfig **configs_a8r8g8b8 = NULL;
       __DRIconfig **configs_x8r8g8b8 = NULL;
@@ -170,7 +170,8 @@ dri_fill_in_modes(struct dri_screen *screen,
 					     depth_buffer_factor,
 					     back_buffer_modes,
 					     back_buffer_factor,
-					     msaa_samples_array, 1);
+					     msaa_samples_array,
+                                             msaa_samples_factor);
       if (pf_x8r8g8b8)
 	 configs_x8r8g8b8 = driCreateConfigs(GL_BGR, GL_UNSIGNED_INT_8_8_8_8_REV,
 					     depth_bits_array,
@@ -178,7 +179,8 @@ dri_fill_in_modes(struct dri_screen *screen,
 					     depth_buffer_factor,
 					     back_buffer_modes,
 					     back_buffer_factor,
-					     msaa_samples_array, 1);
+					     msaa_samples_array,
+                                             msaa_samples_factor);
 
       if (configs_a8r8g8b8 && configs_x8r8g8b8)
 	 configs = driConcatConfigs(configs_x8r8g8b8, configs_a8r8g8b8);




More information about the mesa-commit mailing list