summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-09-30 12:06:56 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-09-30 12:06:56 +1000
commit2882a2db7a766c60bb231978ea829632438dd8a4 (patch)
treeec16733c58fc042ced5e2efe3518f1481fe3e9b4
parent8cd046c9b1da31e4ff178816bdfe2ee3451a1553 (diff)
nouveau: some small API changes
-rw-r--r--src/gallium/winsys/drm/nouveau/nouveau_screen.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gallium/winsys/drm/nouveau/nouveau_screen.c b/src/gallium/winsys/drm/nouveau/nouveau_screen.c
index 9489645151..c6d0c53588 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__);