--- ray/src/hd/rhd_glx1.c 2004/01/01 11:21:55 3.3 +++ ray/src/hd/rhd_glx1.c 2005/01/07 20:33:02 3.5 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rhd_glx1.c,v 3.3 2004/01/01 11:21:55 schorsch Exp $"; +static const char RCSid[] = "$Id: rhd_glx1.c,v 3.5 2005/01/07 20:33:02 greg Exp $"; #endif /* * OpenGL GLX driver for holodeck display. @@ -11,6 +11,7 @@ static const char RCSid[] = "$Id: rhd_glx1.c,v 3.3 200 #include #include +#include "platform.h" #include "rhd_qtree.h" #include "rhdriver.h" #include "rhdisp.h" @@ -60,6 +61,8 @@ static const char RCSid[] = "$Id: rhd_glx1.c,v 3.3 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 */ @@ -141,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; @@ -210,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;