From: Ben Skeggs <skeggsb@gmail.com>
Date: Tue, 30 Sep 2008 02:06:56 +0000 (+1000)
Subject: nouveau: some small API changes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2882a2db7a766c60bb231978ea829632438dd8a4;p=mesa.git

nouveau: some small API changes
---

diff --git a/src/gallium/winsys/drm/nouveau/nouveau_screen.c b/src/gallium/winsys/drm/nouveau/nouveau_screen.c
index 94896451519..c6d0c535887 100644
--- a/src/gallium/winsys/drm/nouveau/nouveau_screen.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_screen.c
@@ -114,7 +114,7 @@ nouveau_destroy_buffer(__DRIdrawablePrivate * driDrawPriv)
 	struct nouveau_framebuffer *nvfb;
 	
 	nvfb = (struct nouveau_framebuffer *)driDrawPriv->driverPrivate;
-	st_unreference_framebuffer(&nvfb->stfb);
+	st_unreference_framebuffer(nvfb->stfb);
 	free(nvfb);
 }
 
@@ -133,8 +133,9 @@ nouveau_fill_in_modes(__DRIscreenPrivate *psp,
 		GLX_NONE, GLX_SWAP_UNDEFINED_OML,
 	};
 
-	u_int8_t depth_bits_array[3];
-	u_int8_t stencil_bits_array[3];
+	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;
@@ -148,9 +149,10 @@ nouveau_fill_in_modes(__DRIscreenPrivate *psp,
 	stencil_bits_array[1] = 0;
 	if (depth_bits == 24)
 		stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;
-
 	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;
@@ -167,7 +169,7 @@ nouveau_fill_in_modes(__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__);