--- doc/registry/specs/glx.spec	Sat Mar 23 04:13:05 2002
+++ /home/magallon/devel/spyglass/src/specs/glx.spec	Tue Mar 26 12:30:04 2002
@@ -55,49 +55,50 @@
 	glxopcode	 2
 
 
-CreateContext(gc_id, screen, visual, share_list)
-	return		 void
-	param		 gc_id		Int32 in value
-	param		 screen		Int32 in value
-	param		 visual		Int32 in value
-	param		 share_list	Int32 in value
+CreateContext(dpy, visual, share_list, direct)
+	return		 GLXContext
+	param		 dpy		DisplayPointer in value
+	param		 visual		XVisualInfoPointer in value
+	param		 share_list	GLXContext in value
+	param		 direct		Bool in value
 	glxflags	 client-handcode server-handcode
 	category	 glx
 	dlflags		 notlistable
 	glxopcode	 3
 
 
-DestroyContext(context)
+DestroyContext(dpy, ctx)
 	return		 void
-	param		 context       Int32 in value
+	param		 ctx		GLXContext in value
 	glxflags	 client-handcode server-handcode
 	category	 glx
 	dlflags		 notlistable
 	glxopcode	 4
 
 
-MakeCurrent(drawable, context)
-	return		 void
-	param		 drawable	Int32 in value
-	param		 context       Int32 in value
-	glxflags	 client-handcode server-handcode
+MakeCurrent(dpy, drawable, ctx)
+	return		 Bool
+	param		 dpy		DisplayPointer in value
+	param		 drawable	GLXDrawable in value
+	param		 ctx		GLXContext in value
 	category	 glx
 	dlflags		 notlistable
 	glxopcode	 5
 
 
-IsDirect(dpy, context)
-	return		void
-	param		dpy		Int32 in value
-	param		context		Int32 in value
-	glxflags	client-handcode server-handcode
-	category	glx
-	dlflags		notlistable
-	glxopcode	6
+IsDirect(dpy, ctx)
+	return		 Bool
+	param		 dpy		DisplayPointer in value
+	param		 ctx		GLXContext in value
+	glxflags	 client-handcode server-handcode
+	category	 glx
+	dlflags		 notlistable
+	glxopcode	 6
 
 
-QueryVersion(major, minor)
-	return		 void
+QueryVersion(dpy, major, minor)
+	return		 Bool
+	param		 dpy		DisplayPointer in value
 	param		 major		Int32 out reference
 	param		 minor		Int32 out reference
 	category	 glx
@@ -106,9 +107,8 @@
 	glxopcode	 7
 
 
-WaitGL(context)
+WaitGL()
 	return		 void
-	param		 context	Int32 in value
 	category	 glx
 	dlflags		 notlistable
 	glxflags	 client-handcode server-handcode
@@ -123,20 +123,22 @@
 	glxopcode	 9
 
 
-CopyContext(source, dest, mask)
+CopyContext(dpy, source, dest, mask)
 	return		 void
-	param		 source		Int32 in value
-	param		 dest		Int32 in value
-	param		 mask		Int32 in value
+	param		 dpy		DisplayPointer in value
+	param		 source		GLXContext in value
+	param		 dest		GLXContext in value
+	param		 mask		UInt32 in value
 	category	 glx
 	dlflags		 notlistable
 	glxflags	 client-handcode server-handcode
 	glxopcode	 10
 
 
-SwapBuffers(drawable)
+SwapBuffers(dpy, drawable)
 	return		 void
-	param		 drawable	Int32 in value
+	param		 dpy		DisplayPointer in value
+	param		 drawable	GLXDrawable in value
 	category	 glx
 	dlflags		 notlistable
 	glxflags	 client-handcode server-handcode
@@ -145,7 +147,7 @@
 
 UseXFont(font, first, count, list_base)
 	return		 void
-	param		 font		Int32 in value
+	param		 font		Font in value
 	param		 first		Int32 in value
 	param		 count		Int32 in value
 	param		 list_base	Int32 in value
@@ -155,11 +157,11 @@
 	glxopcode	 12
 
 
-CreateGLXPixmap(visual, pixmap, glxpixmap)
-	return		 void
-	param		 visual		Int32 in value
-	param		 pixmap		Int32 in value
-	param		 glxpixmap	Int32 in value
+CreateGLXPixmap(dpy, visual, pixmap)
+	return		 GLXPixmap
+	param		 dpy		DisplayPointer in value
+	param		 visual		XVisualInfoPointer in value
+	param		 pixmap		Pixmap in value
 	category	 glx
 	dlflags		 notlistable
 	glxflags	 client-handcode server-handcode
@@ -173,9 +175,10 @@
 	glxopcode	 14
 
 
-DestroyGLXPixmap(pixmap)
+DestroyGLXPixmap(dpy, pixmap)
 	return		 void
-	param		 pixmap		Int32 in value
+	param		 dpy		DisplayPointer in value
+	param		 pixmap		GLXPixmap in value
 	glxflags	 client-handcode
 	category	 glx
 	dlflags		 notlistable
@@ -202,16 +205,18 @@
 # GLX1.1 commands
 #
 ###############################################################################
-QueryExtensionsString(screen)
-	return		void
+QueryExtensionsString(dpy, screen)
+	return		GLXstring
+	param		dpy		DisplayPointer in value
 	param		screen		Int32 in value
 	glxflags	client-handcode server-handcode
 	category	glx
 	dlflags		notlistable
 	glxopcode	18
 
-QueryServerString(screen, name)
-	return		void
+QueryServerString(dpy, screen, name)
+	return		GLXstring
+	param		dpy		DisplayPointer in value
 	param		screen		Int32 in value
 	param		name		Int32 in value
 	glxflags	client-handcode server-handcode
@@ -231,71 +236,84 @@
 # GLX1.3 commands
 #
 ###############################################################################
-GetFBConfigs()
-	return		void
+GetFBConfigs(dpy, screen, nelements)
+	return		GLXFBConfigPointer
+	param		dpy		DisplayPointer in value
+	param		screen		Int32 in value
+	param		nelements	Int32 out reference
 	category	glx
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	glxopcode	21
 
-CreatePixmap(config, pixmap, glxpixmap)
-	return		void
-	param		config		Int32 in value
-	param		pixmap		Int32 in value
-	param		glxpixmap	Int32 in value
+CreatePixmap(dpy, config, pixmap, attriblist)
+	return		GLXPixmap
+	param		dpy		DisplayPointer in value
+	param		config		GLXFBConfig in value
+	param		pixmap		Pixmap in value
+	param		attriblist	Int32 in array
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	category	glx
 	glxopcode	22
 
-DestroyPixmap(glxpixmap)
+DestroyPixmap(dpy, pixmap)
 	return		void
-	param		glxpixmap	Int32 in value
+	param		dpy		DisplayPointer in value
+	param		pixmap		Pixmap in value
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	category	glx
 	glxopcode	23
 
-CreateNewContext(config, render_type, share_list, direct)
-	return		void
-	param		config		Int32 in value
+CreateNewContext(dpy, config, render_type, share_list, direct)
+	return		GLXContext
+	param		dpy		DisplayPointer in value
+	param		config		GLXFBConfig in value
 	param		render_type	Int32 in value
-	param		share_list	Int32 in value
-	param		direct		Int32 in value
+	param		share_list	GLXContext in value
+	param		direct		Bool in value
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	category	glx
 	glxopcode	24
 
-QueryContext()
-	return		void
+QueryContext(dpy, context, attribute, value)
+	return		Int32
+	param		dpy		DisplayPointer in value
+	param		context		GLXContext in value
+	param		attribute	Int32 in value
+	param		value		Int32 out reference
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	category	glx
 	glxopcode	25
 
-MakeContextCurrent(drawable, readdrawable, context)
-	return		void
-	param		drawable	Int32 in value
-	param		readdrawable	Int32 in value
-	param		context		Int32 in value
+MakeContextCurrent(dpy, drawdrawable, readdrawable, context)
+	return		Bool
+	param		dpy		DisplayPointer in value
+	param		drawdrawable	GLXDrawable in value
+	param		readdrawable	GLXDrawable in value
+	param		context		GLXContext in value
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	category	glx
 	glxopcode	26
 
-CreatePbuffer(config, pbuffer)
-	return		void
-	param		config		Int32 in value
-	param		pbuffer		Int32 in value
+CreatePbuffer(dpy, config, attrib_list)
+	return		GLXPbuffer
+	param		dpy		DisplayPointer in value
+	param		config		GLXFBConfig in value
+	param		attrib_list	Int32 in array
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	category	glx
 	glxopcode	27
 
-DestroyPbuffer(pbuffer)
+DestroyPbuffer(dpy, pbuffer)
 	return		void
-	param		pbuffer		Int32 in value
+	param		dpy		DisplayPointer in value
+	param		pbuffer		GLXPbuffer in value
 	dlflags		notlistable
 	glxflags	client-handcode
 	category	glx
@@ -317,24 +335,33 @@
 	category	glx
 	glxopcode	30
 
-CreateWindow(config, window, glxwindow)
-	return		void
-	param		config		Int32 in value
-	param		window		Int32 in value
-	param		glxwindow	Int32 in value
+CreateWindow(dpy, config, window, attrib_list)
+	return		GLXWindow
+	param		dpy		DisplayPointer in value
+	param		config		GLXFBConfig in value
+	param		window		Window in value
+	param		attrib_list	Int32 in array
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	category	glx
 	glxopcode	31
 
-DestroyWindow(glxwindow)
+DestroyWindow(dpy, window)
 	return		void
-	param		glxwindow	Int32 in value
+	param		dpy		DisplayPointer in value
+	param		window		Window in value
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	category	glx
 	glxopcode	32
 
+ChooseVisual(dpy, screen, attriblist)
+	return		XVisualInfoPointer
+	param		dpy		DisplayPointer in value
+	param		screen		Int32 in value
+	param		attriblist	Int32 out array
+	category	glx
+
 ###############################################################################
 #
 # IRIX5.3 extension commands
@@ -412,8 +439,12 @@
 # EXT_import_context extension commands
 #
 ###############################################################################
-QueryContextInfoEXT()
-	return		 void
+QueryContextInfoEXT(dpy, context, attribute, value)
+	return		 Int32
+	param		dpy		DisplayPointer in value
+	param		context		GLXContext in value
+	param		attribute	Int32 in value
+	param		value		Int32 out reference
 	category	 glx
 	dlflags		 notlistable
 	glxflags	 client-handcode server-handcode
@@ -431,26 +462,28 @@
 	glxflags	 client-handcode server-handcode
 	glxvendorglx	 65540
 
-CreateContextWithConfigSGIX(gc_id, screen, config, share_list)
-	return		 void
-	param		 gc_id		Int32 in value
-	param		 screen		Int32 in value
-	param		 config		Int32 in value
-	param		 share_list	Int32 in value
+CreateContextWithConfigSGIX(dpy, config, renderType, share_list, allow_direct)
+	return		 GLXContext
+	param		 dpy		DisplayPointer in value
+	param		 config		GLXFBConfigSGIX in value
+	param		 renderType	Int32 in value
+	param		 share_list	GLXContext in value
+	param		 allow_direct	Bool in value
 	glxflags	 client-handcode server-handcode
 	category	 glx
 	dlflags		 notlistable
 	glxvendorglx	 65541
 
-CreateGLXPixmapWithConfigSGIX(config, pixmap, glxpixmap)
-	return		 void
-	param		 config		Int32 in value
-	param		 pixmap		Int32 in value
-	param		 glxpixmap	Int32 in value
-	category	 glx
-	dlflags		 notlistable
-	glxflags	 client-handcode server-handcode
-	glxvendorglx	 65542
+CreateGLXPixmapWithConfigSGIX(dpy, config, pixmap, attriblist)
+	return		GLXPixmap
+	param		dpy		DisplayPointer in value
+	param		config		GLXFBConfigSGIX in value
+	param		pixmap		Pixmap in value
+	param		attriblist	Int32 in array
+	category	glx
+	dlflags		notlistable
+	glxflags	client-handcode server-handcode
+	glxvendorglx	65542
 
 ###############################################################################
 #
@@ -458,18 +491,22 @@
 #
 ###############################################################################
 
-CreateGLXPbufferSGIX(config, pbuffer)
-	return		 void
-	param		 config		Int32 in value
-	param		 pbuffer	Int32 in value
+CreateGLXPbufferSGIX(dpy, config, width, height, attriblist)
+	return		 GLXPbuffer
+	param		 dpy		DisplayPointer in value
+	param		 config		GLXFBConfig in value
+	param		 width		UInt32 in value
+	param		 height		UInt32 in value
+	param		 attriblist	Int32 in array
 	dlflags		 notlistable
 	glxflags	 client-handcode server-handcode
 	category	 glx
 	glxvendorglx	 65543
 
-DestroyGLXPbufferSGIX(pbuffer)
+DestroyGLXPbufferSGIX(dpy, pbuffer)
 	return		 void
-	param		 pbuffer	Int32 in value
+	param		 dpy		DisplayPointer in value
+	param		 pbuffer	GLXPbuffer in value
 	dlflags		 notlistable
 	glxflags	 client-handcode
 	category	 glx
@@ -497,10 +534,11 @@
 #
 ###############################################################################
 
-JoinSwapGroupSGIX(window,group)
+JoinSwapGroupSGIX(dpy, drawable, member)
 	return		void
-	param		window		Int32 in value
-	param		group		Int32 in value
+	param		dpy		DisplayPointer in value
+	param		drawable	GLXDrawable in value
+	param		member		GLXDrawable in value
 	glxflags	client-handcode server-handcode
 	category	glx
 	dlflags		notlistable
@@ -512,17 +550,21 @@
 #
 ###############################################################################
 
-BindSwapBarrierSGIX(window,barrier)
+BindSwapBarrierSGIX(dpy, drawable, barrier)
 	return		void
-	param		window		Int32 in value
+	param		dpy		DisplayPointer in value
+	param		drawable	GLXDrawable in value
 	param		barrier		Int32 in value
 	glxflags	client-handcode server-handcode
 	category	glx
 	dlflags		notlistable
 	glxvendorglx	65548
 
-QueryMaxSwapBarriersSGIX()
-	return		void
+QueryMaxSwapBarriersSGIX(dpy, screen, max)
+	return		Bool
+	param		dpy		DisplayPointer in value
+	param		screen		Int32 in value
+	param		max		Int32 out value
 	glxflags	client-handcode server-handcode
 	category	glx
 	dlflags		notlistable