[Brlcad-commits] CVS: brlcad/src/libdm dm-ogl.c,14.8,14.9 dm-ogl_win.c,14.9,14.10 query.c,14.5,14.6

[Sean M. <br...@us...>]

Update of /cvsroot/brlcad/brlcad/src/libdm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8920/src/libdm

Modified Files:
	dm-ogl.c dm-ogl_win.c query.c 
Log Message:
bye bye USE_MESA_GL .. needs some good testing on the ogl interface

Index: dm-ogl.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm-ogl.c,v
retrieving revision 14.8
retrieving revision 14.9
diff -w -u -r14.8 -r14.9
--- dm-ogl.c	13 Mar 2005 00:43:40 -0000	14.8
+++ dm-ogl.c	20 Mar 2005 00:19:56 -0000	14.9
@@ -297,7 +297,7 @@
     (void)ogl_close(dmp);
     return DM_NULL;
   }
-#ifndef USE_MESA_GL
+
   {
     int return_val;
 
@@ -307,7 +307,7 @@
       return DM_NULL;
     }
   }
-#endif
+
   if(dmp->dm_width == 0){
     dmp->dm_width =
       DisplayWidth(tmp_dpy, DefaultScreen(tmp_dpy)) - 30;

Index: dm-ogl_win.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/dm-ogl_win.c,v
retrieving revision 14.9
retrieving revision 14.10
diff -w -u -r14.9 -r14.10
--- dm-ogl_win.c	13 Mar 2005 00:43:40 -0000	14.9
+++ dm-ogl_win.c	20 Mar 2005 00:19:56 -0000	14.10
@@ -297,7 +297,6 @@
     return DM_NULL;
   }
 
-#ifndef USE_MESA_GL
   {
     int return_val;
 
@@ -307,7 +306,6 @@
       return DM_NULL;
     }
   }
-#endif
 
   if(dmp->dm_width == 0){
     dmp->dm_width =

Index: query.c
===================================================================
RCS file: /cvsroot/brlcad/brlcad/src/libdm/query.c,v
retrieving revision 14.5
retrieving revision 14.6
diff -w -u -r14.5 -r14.6
--- query.c	30 Jan 2005 20:30:47 -0000	14.5
+++ query.c	20 Mar 2005 00:19:56 -0000	14.6
@@ -52,26 +52,8 @@
 {
 	int val = 0;
 
-#ifdef WIN32
-  if(!strcmp(name, "ogl"))
-     return 1;
-#else
-#if !defined(USE_MESA_GL) && defined(DM_OGL)
-	int return_val;
-#endif
-
-#ifdef USE_MESA_GL
-
-#ifdef DM_OGL
-	if (!strcmp(name, "ogl"))
-		return 1;
-#endif
-#ifdef DM_X
-	if (!strcmp(name, "X"))
-		return 1;
-#endif
-
-#else /* Here we assume the X server supports OpenGL */
+#ifdef HAVE_XOPENDISPLAY
+	/* Here we assume the X server supports OpenGL */
 	Display *dpy;
 
 	if ((dpy = XOpenDisplay(dpy_string)) == NULL) {
@@ -92,9 +74,19 @@
 
 	XCloseDisplay(dpy);
 
+#else /* HAVE_XOPENDISPLAY */
+
+#  ifdef DM_OGL
+	int return_val;
+	if (!strcmp(name, "ogl"))
+		return 1;
+#  endif
+#  ifdef DM_X
+	if (!strcmp(name, "X"))
+		return 1;
 #endif
 
-#endif /* WIN32*/
+#endif /* HAVE_XOPENDISPLAY */
 
   return val;
 }