--- ray/src/hd/rhd_glx1.c	2004/03/28 20:33:13	3.4
+++ ray/src/hd/rhd_glx1.c	2011/05/20 02:06:39	3.7
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhd_glx1.c,v 3.4 2004/03/28 20:33:13 schorsch Exp $";
+static const char	RCSid[] = "$Id: rhd_glx1.c,v 3.7 2011/05/20 02:06:39 greg Exp $";
 #endif
 /*
  * OpenGL GLX driver for holodeck display.
@@ -61,6 +61,8 @@ static const char	RCSid[] = "$Id: rhd_glx1.c,v 3.4 200
 
 struct driver	odev;			/* global device driver structure */
 
+TMstruct	*tmGlobal;		/* global tone-mapping structure */
+
 char odev_args[64];			/* command arguments */
 
 static XEvent  currentevent;		/* current event */
@@ -142,7 +144,8 @@ dev_open(
 				&myprims[BLU][CIEX],&myprims[BLU][CIEY],
 				&myprims[WHT][CIEX],&myprims[WHT][CIEY]) >= 6)
 		dpri = myprims;
-	if (tmInit(mytmflags(), dpri, gamval) == NULL)
+	tmGlobal = tmInit(mytmflags(), dpri, gamval);
+	if (tmGlobal == NULL)
 		error(SYSTEM, "not enough memory in dev_open");
 					/* open window */
 	ourwinattr.background_pixel = ourblack;
@@ -211,7 +214,7 @@ dev_close(void)			/* close our display and free resour
 	XCloseDisplay(ourdisplay);
 	ourdisplay = NULL;
 	qtFreeLeaves();
-	tmDone(NULL);
+	tmDone(tmGlobal);
 	freecones();
 	odev.v.type = 0;
 	odev.hres = odev.vres = 0;
@@ -283,7 +286,8 @@ dev_view(			/* assign new driver view */
 
 extern void
 dev_section(		/* add octree for geometry rendering */
-	char	*ofn
+	char	*gfn,
+	char	*pfn
 )
 {
 	/* unimplemented */
@@ -340,7 +344,7 @@ dev_flush(void)			/* flush output */
 
 extern void
 dev_cone(		/* render a cone in view coordinates */
-	BYTE	rgb[3],
+	uby8	rgb[3],
 	FVECT	ip,
 	double	rad
 )
@@ -480,7 +484,7 @@ draw3dline(			/* draw 3d line in world coordinates */
 static void
 draw_grids(void)			/* draw holodeck section grids */
 {
-	static BYTE	gridrgba[4] = {0x0, 0xff, 0xff, 0x00};
+	static uby8	gridrgba[4] = {0x0, 0xff, 0xff, 0x00};
 	double	xmin, xmax, ymin, ymax, zmin, zmax;
 	double	d;
 					/* can we even do it? */