new arguments to XMesaCreateVisual()
diff --git a/include/GL/xmesa.h b/include/GL/xmesa.h
index 59c4a86..663ccb8 100644
--- a/include/GL/xmesa.h
+++ b/include/GL/xmesa.h
@@ -1,4 +1,4 @@
-/* $Id: xmesa.h,v 1.6 2000/03/31 01:04:07 brianp Exp $ */
+/* $Id: xmesa.h,v 1.7 2000/04/05 22:09:58 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -141,41 +141,35 @@
* db_flag - GL_TRUE = double-buffered,
* GL_FALSE = single buffered
* stereo_flag - stereo visual?
- * depth_size - requested bits/depth values, or zero
- * stencil_size - requested bits/stencil values, or zero
- * accum_size - requested bits/component values, or zero
* ximage_flag - GL_TRUE = use an XImage for back buffer,
* GL_FALSE = use an off-screen pixmap for back buffer
+ * depth_size - requested bits/depth values, or zero
+ * stencil_size - requested bits/stencil values, or zero
+ * accum_red_size - requested bits/red accum values, or zero
+ * accum_green_size - requested bits/green accum values, or zero
+ * accum_blue_size - requested bits/blue accum values, or zero
+ * accum_alpha_size - requested bits/alpha accum values, or zero
+ * num_samples - number of samples/pixel if multisampling, or zero
+ * level - visual level, usually 0
+ * visualCaveat - ala the GLX extension, usually GLX_NONE_EXT
* Return; a new XMesaVisual or 0 if error.
*/
extern XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
- XMesaVisualInfo visinfo,
- GLboolean rgb_flag,
- GLboolean alpha_flag,
- GLboolean db_flag,
- GLboolean stereo_flag,
- GLboolean ximage_flag,
- GLint depth_size,
- GLint stencil_size,
- GLint accum_size,
- GLint level );
-
-extern XMesaVisual XMesaCreateVisual2( XMesaDisplay *display,
- XMesaVisualInfo visinfo,
- GLboolean rgb_flag,
- GLboolean alpha_flag,
- GLboolean db_flag,
- GLboolean stereo_flag,
- GLboolean ximage_flag,
- GLint depth_size,
- GLint stencil_size,
- GLint accum_red_size,
- GLint accum_green_size,
- GLint accum_blue_size,
- GLint accum_alpha_size,
- GLint num_samples,
- GLint level,
- GLint visualCaveat );
+ XMesaVisualInfo visinfo,
+ GLboolean rgb_flag,
+ GLboolean alpha_flag,
+ GLboolean db_flag,
+ GLboolean stereo_flag,
+ GLboolean ximage_flag,
+ GLint depth_size,
+ GLint stencil_size,
+ GLint accum_red_size,
+ GLint accum_green_size,
+ GLint accum_blue_size,
+ GLint accum_alpha_size,
+ GLint num_samples,
+ GLint level,
+ GLint visualCaveat );
/*
* Destroy an XMesaVisual, but not the associated XVisualInfo.
diff --git a/progs/xdemos/xdemo.c b/progs/xdemos/xdemo.c
index 13facba..28f945b 100644
--- a/progs/xdemos/xdemo.c
+++ b/progs/xdemos/xdemo.c
@@ -1,4 +1,4 @@
-/* $Id: xdemo.c,v 1.1 1999/08/19 00:55:43 jtg Exp $ */
+/* $Id: xdemo.c,v 1.2 2000/04/05 22:09:58 brianp Exp $ */
/*
@@ -14,8 +14,11 @@
/*
* $Log: xdemo.c,v $
- * Revision 1.1 1999/08/19 00:55:43 jtg
- * Initial revision
+ * Revision 1.2 2000/04/05 22:09:58 brianp
+ * new arguments to XMesaCreateVisual()
+ *
+ * Revision 1.1.1.1 1999/08/19 00:55:43 jtg
+ * Imported sources
*
* Revision 3.0 1998/02/21 02:16:54 brianp
* initial rev
@@ -184,8 +187,10 @@
GL_FALSE, /* ximage_flag */
0, /* depth size */
0, /* stencil size */
- 0, /* accum_size */
- 0 /* level */
+ 0,0,0,0, /* accum_size */
+ 0, /* num samples */
+ 0, /* level */
+ 0 /* caveat */
);
if (!visual) {
printf("Couldn't create Mesa/X visual!\n");
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 8ffdd34..08a931a 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.30 2000/03/31 18:17:01 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.31 2000/04/05 22:09:58 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -292,12 +292,12 @@
return NULL;
}
- xmvis = XMesaCreateVisual2( dpy, vinfo, rgbFlag, alphaFlag, dbFlag,
- stereoFlag, ximageFlag,
- depth_size, stencil_size,
- accumRedSize, accumBlueSize,
- accumBlueSize, accumAlphaSize, 0, level,
- GLX_NONE_EXT );
+ xmvis = XMesaCreateVisual( dpy, vinfo, rgbFlag, alphaFlag, dbFlag,
+ stereoFlag, ximageFlag,
+ depth_size, stencil_size,
+ accumRedSize, accumBlueSize,
+ accumBlueSize, accumAlphaSize, 0, level,
+ GLX_NONE_EXT );
if (xmvis) {
VisualTable[NumVisuals] = xmvis;
NumVisuals++;