[GRASS-SVN] r35263 - in grass/branches/releasebranch_6_4: include lib/nviz

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Jan 7 09:45:36 EST 2009


Author: martinl
Date: 2009-01-07 09:45:36 -0500 (Wed, 07 Jan 2009)
New Revision: 35263

Modified:
   grass/branches/releasebranch_6_4/include/nviz.h
   grass/branches/releasebranch_6_4/lib/nviz/render.c
Log:
glynn: MacOSX changes: remove unused pixmap field, add aglSetPBuffer()
call
   (merge from trunk, r35244)


Modified: grass/branches/releasebranch_6_4/include/nviz.h
===================================================================
--- grass/branches/releasebranch_6_4/include/nviz.h	2009-01-07 14:44:03 UTC (rev 35262)
+++ grass/branches/releasebranch_6_4/include/nviz.h	2009-01-07 14:45:36 UTC (rev 35263)
@@ -131,7 +131,6 @@
     AGLPixelFormat pixelFmtId;
     AGLContext contextId;
     AGLPbuffer windowId;
-    GWorldPtr pixmap;
 #elif defined(OPENGL_WINDOWS)
     HDC displayId;		/* display context */
     HGLRC contextId;		/* rendering context */

Modified: grass/branches/releasebranch_6_4/lib/nviz/render.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/nviz/render.c	2009-01-07 14:44:03 UTC (rev 35262)
+++ grass/branches/releasebranch_6_4/lib/nviz/render.c	2009-01-07 14:45:36 UTC (rev 35263)
@@ -205,6 +205,7 @@
 	return 1;
 
     aglSetCurrentContext(rwin->contextId);
+    aglSetPBuffer(rwin->contextId, rwin->windowId, 0, 0, 0);
 #elif defined(OPENGL_WINDOWS)
     if (!rwin->displayId || !rwin->contextId)
 	return 0;



More information about the grass-commit mailing list