--- ray/src/hd/rhd_ogl.c	1998/12/21 11:42:38	3.3
+++ ray/src/hd/rhd_ogl.c	1998/12/21 19:17:28	3.6
@@ -37,7 +37,7 @@ static char SCCSid[] = "$SunId$ SGI";
 #include "x11icon.h"
 
 #ifndef RAYQLEN
-#define RAYQLEN		10240		/* max. rays to queue before flush */
+#define RAYQLEN		50000		/* max. rays to queue before flush */
 #endif
 
 #ifndef PORTALP
@@ -142,13 +142,21 @@ char  *id;
 	extern char	*getenv();
 	static RGBPRIMS	myprims = STDPRIMS;
 #if (PORTALP<0)
-	static int	atlBest[] = {GLX_RGBA, GLX_RED_SIZE,8,
-				GLX_GREEN_SIZE,8, GLX_BLUE_SIZE,8,
-				GLX_DEPTH_SIZE,15, None};
+	static int	atlBest[] = {GLX_RGBA, GLX_DOUBLEBUFFER,
+				GLX_RED_SIZE,8, GLX_GREEN_SIZE,8,
+				GLX_BLUE_SIZE,8, GLX_DEPTH_SIZE,15, None};
+	static int	atlOK[] = {GLX_RGBA, GLX_DOUBLEBUFFER,
+				GLX_RED_SIZE,4, GLX_GREEN_SIZE,4,
+				GLX_BLUE_SIZE,4, GLX_DEPTH_SIZE,15, None};
 #else
-	static int	atlBest[] = {GLX_RGBA, GLX_RED_SIZE,8,
-				GLX_GREEN_SIZE,8, GLX_BLUE_SIZE,8,
-				GLX_ALPHA_SIZE,2, GLX_DEPTH_SIZE,15, None};
+	static int	atlBest[] = {GLX_RGBA, GLX_DOUBLEBUFFER,
+				GLX_RED_SIZE,8, GLX_GREEN_SIZE,8,
+				GLX_BLUE_SIZE,8, GLX_ALPHA_SIZE,2,
+				GLX_DEPTH_SIZE,15, None};
+	static int	atlOK[] = {GLX_RGBA, GLX_DOUBLEBUFFER,
+				GLX_RED_SIZE,4, GLX_GREEN_SIZE,4,
+				GLX_BLUE_SIZE,4, GLX_ALPHA_SIZE,2,
+				GLX_DEPTH_SIZE,15, None};
 #endif
 	char	*ev;
 	double	gamval = GAMMA;
@@ -162,8 +170,8 @@ char  *id;
 #endif
 					/* open display server */
 	ourdisplay = XOpenDisplay(NULL);
-	if (ourdisplay == NULL)
-		error(USER, "cannot open X-windows; DISPLAY variable set?\n");
+	CHECK(ourdisplay==NULL, USER,
+			"cannot open X-windows; DISPLAY variable set?");
 #ifdef STEREO
 	switch (XSGIQueryStereoMode(ourdisplay, ourroot)) {
 	case STEREO_TOP:
@@ -171,7 +179,7 @@ char  *id;
 		break;
 	case STEREO_OFF:
 		error(USER,
-	"wrong video mode: run \"/usr/gfx/setmon -n STR_TOP\" first");
+		"wrong video mode: run \"/usr/gfx/setmon -n STR_TOP\" first");
 	case X_STEREO_UNSUPPORTED:
 		error(USER, "stereo mode not supported on this screen");
 	default:
@@ -181,7 +189,8 @@ char  *id;
 					/* find a usable visual */
 	ourvinf = glXChooseVisual(ourdisplay, ourscreen, atlBest);
 	if (ourvinf == NULL)
-		error(USER, "no suitable visuals available");
+		ourvinf = glXChooseVisual(ourdisplay, ourscreen, atlOK);
+	CHECK(ourvinf==NULL, USER, "no suitable visuals available");
 					/* get a context */
 	gctx = glXCreateContext(ourdisplay, ourvinf, NULL, GL_TRUE);
 					/* set gamma and tone mapping */
@@ -213,8 +222,7 @@ char  *id;
 #endif
 		BORWIDTH, ourvinf->depth, InputOutput, ourvinf->visual,
 		CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &ourwinattr);
-	if (gwind == 0)
-		error(SYSTEM, "cannot create window\n");
+	CHECK(gwind==0, SYSTEM, "cannot create window");
    	XStoreName(ourdisplay, gwind, id);
 					/* set window manager hints */
 	ourxwmhints.flags = InputHint|IconPixmapHint;
@@ -238,7 +246,7 @@ char  *id;
 	glXMakeCurrent(ourdisplay, gwind, gctx);
 	glEnable(GL_DEPTH_TEST);
 	glDepthFunc(GL_LEQUAL);
-	glDisable(GL_DITHER);
+	glEnable(GL_DITHER);
 	glFrontFace(GL_CCW);
 	glDisable(GL_CULL_FACE);
 	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE);
@@ -262,7 +270,7 @@ char  *id;
 	XMapWindow(ourdisplay, gwind);
 	dev_input();			/* sets size and view angles */
 	if (!odInit(DisplayWidth(ourdisplay,ourscreen) *
-			DisplayHeight(ourdisplay,ourscreen) / 10))
+			DisplayHeight(ourdisplay,ourscreen) / 4))
 		error(SYSTEM, "insufficient memory for value storage");
 	odev.name = id;
 	odev.firstuse = 1;		/* can't recycle samples */
@@ -347,8 +355,7 @@ register VIEW	*nv;
 		VSUM(vwright.vp, nv->vp, nv->hvec, d);
 		/* setview(&vwright);	-- Unnecessary */
 #endif
-	} else
-		viewsteady = 1;
+	}
 	wipeclean();
 	return(1);
 }
@@ -363,6 +370,7 @@ char	*gfn, *pfn;
 	if (gfn == NULL) {
 		gmEndGeom();
 		gmEndPortal();
+		wipeclean();		/* new geometry, so redraw it */
 		return;
 	}
 	if (access(gfn, R_OK) == 0)
@@ -450,8 +458,8 @@ dev_flush()			/* flush output as appropriate */
 #ifdef DOBJ
 		ndrawn += dobj_render();
 #endif
-		if (ndrawn)
-			gmDrawPortals(PORTRED, PORTGRN, PORTBLU, PORTALP);
+		if (ndrawn && gmPortals)
+			gmDrawPortals(PORTRED,PORTGRN,PORTBLU,PORTALP);
 		checkglerr("rendering right eye");
 		popright();			/* draw left eye */
 #endif
@@ -459,29 +467,25 @@ dev_flush()			/* flush output as appropriate */
 #ifdef DOBJ
 		ndrawn += dobj_render();
 #endif
-		if (ndrawn)
-			gmDrawPortals(PORTRED, PORTGRN, PORTBLU, PORTALP);
+		if (ndrawn && gmPortals)
+			gmDrawPortals(PORTRED,PORTGRN,PORTBLU,PORTALP);
+		glXSwapBuffers(ourdisplay, gwind);
 		checkglerr("rendering base view");
 	}
-	if (mapped && viewsteady) {
-		if (isperspective) {		/* first time after steady */
-#ifdef STEREO
-			pushright();
-			popright();
-#endif
+	if (mapped && viewsteady)
+		if (isperspective > 0) {	/* first time after steady */
 			if (ndrawn)
 				xferdepth();	/* transfer and clear depth */
 			setglortho();		/* set orthographic view */
-		} else {
+		} else if (!isperspective) {
 #ifdef STEREO
 			pushright();
 			odUpdate(1);		/* draw right eye */
 			popright();
 #endif
 			odUpdate(0);		/* draw left eye */
+			glFlush();		/* flush OpenGL */
 		}
-	}
-	glFlush();				/* flush OpenGL */
 	rayqleft = RAYQLEN;
 					/* flush X11 and return # pending */
 	return(odev.inpready = XPending(ourdisplay));
@@ -514,12 +518,11 @@ xferdepth()			/* load and clear depth buffer */
 #endif
 		depthbuffer = (GLfloat *)malloc(
 				odev.hres*odev.vres*sizeof(GLfloat));
-		if (depthbuffer == NULL)
-			error(SYSTEM, "out of memory in xferdepth");
+		CHECK(depthbuffer==NULL, SYSTEM, "out of memory in xferdepth");
 	}
 				/* allocate alpha buffer for portals */
 	if (gmPortals)
-		cbuf = (GLubyte *)malloc(odev.hres*odev.vres*
+		cbuf = (GLubyte *)malloc(odev.hres*odev.vres *
 							(4*sizeof(GLubyte)));
 	else
 		cbuf = NULL;
@@ -828,8 +831,8 @@ XButtonPressedEvent	*ebut;
 #ifdef DOBJ
 		ndrawn += dobj_render();
 #endif
-		if (ndrawn)
-			gmDrawPortals(PORTRED, PORTGRN, PORTBLU, PORTALP);
+		if (ndrawn && gmPortals)
+			gmDrawPortals(PORTRED,PORTGRN,PORTBLU,PORTALP);
 		popright();
 #endif
 					/* redraw octrees */
@@ -837,18 +840,11 @@ XButtonPressedEvent	*ebut;
 #ifdef DOBJ
 		ndrawn += dobj_render();	/* redraw objects */
 #endif
-		if (ndrawn)
+		if (ndrawn && gmPortals)
 			gmDrawPortals(PORTRED, PORTGRN, PORTBLU, PORTALP);
-		glFlush();
-		if (!ndrawn) {
+		glXSwapBuffers(ourdisplay, gwind);
+		if (!ndrawn)
 			sleep(1);	/* for reasonable interaction */
-#ifdef STEREO
-			pushright();
-			draw_grids(0);
-			popright();
-#endif
-			draw_grids(0);
-		}
 	}
 	if (!(inpresflags & DFL(DC_SETVIEW))) {	/* do final motion */
 		movdir = MOVDIR(levptr(XButtonReleasedEvent)->button);
@@ -856,6 +852,7 @@ XButtonPressedEvent	*ebut;
 		wy = levptr(XButtonReleasedEvent)->y;
 		moveview(wx, odev.vres-1-wy, movdir, movorb);
 	}
+	viewsteady = 1;			/* done goofing around */
 }
 
 
@@ -924,6 +921,7 @@ register VIEW	*vp;
 static
 setglortho()			/* set up orthographic view for cone drawing */
 {
+	glDrawBuffer(GL_FRONT);		/* use single-buffer mode */
 					/* set view matrix */
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
@@ -939,16 +937,17 @@ setglortho()			/* set up orthographic view for cone dr
 static
 wipeclean()			/* prepare for redraw */
 {
-					/* clear depth buffer */
+	glDrawBuffer(GL_BACK);		/* use double-buffer mode */
+					/* clear buffers */
 #ifdef STEREO
 	setstereobuf(STEREO_BUFFER_RIGHT);
-	glClear(GL_DEPTH_BUFFER_BIT);
+	glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT);
 	setstereobuf(STEREO_BUFFER_LEFT);
 #endif
-	glClear(GL_DEPTH_BUFFER_BIT);
+	glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT);
+	freedepth();
 	if (viewsteady)			/* clear samples if steady */
 		odClean();
-	freedepth();
 	setglpersp(&odev.v);		/* reset view & clipping planes */
 }
 
@@ -1000,10 +999,10 @@ register XKeyPressedEvent  *ekey;
 		return;
 	case CTRL('R'):			/* redraw screen */
 		odRemap(0);
-		glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+		glClear(GL_DEPTH_BUFFER_BIT);
 #ifdef STEREO
 		setstereobuf(STEREO_BUFFER_RIGHT);
-		glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+		glClear(GL_DEPTH_BUFFER_BIT);
 		setstereobuf(STEREO_BUFFER_LEFT);
 #endif
 		return;