Committing in .

 Modified Files:
 	Mesa/include/GL/glx.h Mesa/include/GL/xmesa.h
 	Mesa/src/descrip.mms Mesa/src/X/glxheader.h
 	Mesa/src/X/xfonts.c Mesa/src/X/xfonts.h
 	Mesa/src-glu/descrip.mms Mesa/src-glut/capturexfont.c
 	Mesa/src-glut/descrip.mms Mesa/src-glut/glut_cmap.c
 	Mesa/src-glut/glut_event.c Mesa/src-glut/glut_fullscrn.c
 	Mesa/src-glut/glut_gamemode.c Mesa/src-glut/glut_init.c
 	Mesa/src-glut/glut_input.c Mesa/src-glut/glut_menu.c
 	Mesa/src-glut/glut_menu2.c Mesa/src-glut/glut_overlay.c
 	Mesa/src-glut/glut_win.c Mesa/src-glut/glut_winmisc.c
 	Mesa/src-glut/glutint.h Mesa/src-glut/layerutil.h
 	Mesa/vms/analyze_map.com
 Added Files:
 	Mesa/include/GL/vms_x_fix.h

 Patches effective on VMS only. This allows for compiling with
 /name=(as_is,short). This breaks the binary compatibility with previous
 versions for VMS, but is the only way to combine Mesa with GTK for VMS.

                      Jouk
----------------------------------------------------------------------

diff --git a/include/GL/glx.h b/include/GL/glx.h
index c2ae5d35b95ac0e64ac66fefb12bf2481d2dd66f..9082c3dcd106dd24bbd258b2d4657e4922083940 100644 (file)
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,4 +1,4 @@
-/* $Id: glx.h,v 1.22 2000/06/23 17:39:18 brianp Exp $ */
+/* $Id: glx.h,v 1.23 2000/08/22 13:31:00 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,6 +30,7 @@
 
 
 #ifdef __VMS
+#include <GL/vms_x_fix.h>
 # ifdef __cplusplus
 /* VMS Xlib.h gives problems with C++.
  * this avoids a bunch of trivial warnings */

diff --git a/include/GL/vms_x_fix.h b/include/GL/vms_x_fix.h
new file mode 100644 (file)
index 0000000..6e4fb68
--- /dev/null
+++ b/include/GL/vms_x_fix.h
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *                                                                         *
+ * Repair definitions of Xlib when compileing with /name=(as_is) on VMS    *
+ * You'll need the PORTING_LIBRARY (get it from Compaq) installed          *
+ *                                                                         *
+ * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
+ *                                                                         *
+ * Last revision : 22 August 2000                                          *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef VMS_X_FIX
+#define VMS_X_FIX
+
+#ifdef __cplusplus
+#define VMS_BEGIN_C_PLUS_PLUS extern "C" {
+#define VMS_END_C_PLUS_PLUS }
+#else
+#define VMS_BEGIN_C_PLUS_PLUS
+#define VMS_END_C_PLUS_PLUS
+#endif
+
+#include <motif_redefines.h>
+
+#define XQueryFont XQUERYFONT
+#define XSetPlaneMask XSETPLANEMASK
+#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL
+#define XDestroySubwindows XDESTROYSUBWINDOWS
+#define XFreeDeviceList XFREEDEVICELIST
+#define XFreeDeviceState XFREEDEVICESTATE
+#define XGetExtensionVersion XGETEXTENSIONVERSION
+#define XGetRGBColormaps XGETRGBCOLORMAPS
+#define XIconifyWindow XICONIFYWINDOW
+#define XInstallColormap XINSTALLCOLORMAP
+#define XListInputDevices XLISTINPUTDEVICES
+#define XLookupKeysym XLOOKUPKEYSYM
+#define XOpenDevice XOPENDEVICE
+#define XQueryDeviceState XQUERYDEVICESTATE
+#define XSelectExtensionEvent XSELECTEXTENSIONEVENT
+#define XWarpPointer XWARPPOINTER
+#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP
+
+#endif

diff --git a/include/GL/xmesa.h b/include/GL/xmesa.h
index 0c50b48c7cd61246412175143987ce74dc47b0f5..273b83508c7100077c4559e27c15f1111578ec31 100644 (file)
--- a/include/GL/xmesa.h
+++ b/include/GL/xmesa.h
@@ -1,4 +1,4 @@
-/* $Id: xmesa.h,v 1.8 2000/05/02 02:30:01 brianp Exp $ */
+/* $Id: xmesa.h,v 1.9 2000/08/22 13:31:01 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -67,12 +67,14 @@ See the demos/xdemo.c and xmesa1.c files for examples.
 #ifndef XMESA_H
 #define XMESA_H
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 #ifdef XFree86Server
 #include "xmesa_xf86.h"
 #else

diff --git a/src/glu/mesa/descrip.mms b/src/glu/mesa/descrip.mms
index 5f5334c741905c951711cfc20f1d070f1d186696..16a1e615362a450b1ef08edd2943f60943a0143e 100644 (file)
--- a/src/glu/mesa/descrip.mms
+++ b/src/glu/mesa/descrip.mms
@@ -12,7 +12,7 @@ VPATH = RCS
 
 INCDIR = $disk2:[-.include]
 LIBDIR = [-.lib]
-CFLAGS = /include=$(INCDIR)/define=(FBIND=1)
+CFLAGS = /include=$(INCDIR)/define=(FBIND=1)/name=(as_is,short)
 
 SOURCES = glu.c mipmap.c nurbs.c nurbscrv.c nurbssrf.c nurbsutl.c \
        polytest.c project.c quadric.c tess.c tesselat.c

diff --git a/src/glut/glx/capturexfont.c b/src/glut/glx/capturexfont.c
index 3bed13c9beb1353edab432d15647954da062798f..b99e7930564a19899189cff289fb007ad463a25b 100644 (file)
--- a/src/glut/glx/capturexfont.c
+++ b/src/glut/glx/capturexfont.c
@@ -10,6 +10,10 @@
    encoding  the font for GLUT's use. Example usage:
    capturexfont.c 9x15 glutBitmap9By15 > glut_9x15.c */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/glut/glx/descrip.mms b/src/glut/glx/descrip.mms
index e6aeb8352e68562af6806624b801cc3971c224c6..5d59c42db482a23c6b96fe61626c9bbcfd5f02a6 100644 (file)
--- a/src/glut/glx/descrip.mms
+++ b/src/glut/glx/descrip.mms
@@ -14,7 +14,7 @@ VPATH = RCS
 
 INCDIR = [-.include]
 LIBDIR = [-.lib]
-CFLAGS = /nowarn/include=$(INCDIR)/prefix=all
+CFLAGS = /nowarn/include=$(INCDIR)/prefix=all/name=(as_is,short)
 
 SOURCES = \
 glut_8x13.c \

diff --git a/src/glut/glx/glut_cmap.c b/src/glut/glx/glut_cmap.c
index a9d004003f646b0758b6358ab4915c521a1b467f..1c496ad66da70e86a27ca58faa8f75c6640065cc 100644 (file)
--- a/src/glut/glx/glut_cmap.c
+++ b/src/glut/glx/glut_cmap.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>  /* SunOS multithreaded assert() needs <stdio.h>.  Lame. */

diff --git a/src/glut/glx/glut_event.c b/src/glut/glx/glut_event.c
index 6d928af2ea3fd787716ba61b97e9107f21ab569a..f4463dee0b6bee765e24aefc33013e943268a06b 100644 (file)
--- a/src/glut/glx/glut_event.c
+++ b/src/glut/glx/glut_event.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>

diff --git a/src/glut/glx/glut_fullscrn.c b/src/glut/glx/glut_fullscrn.c
index 8d58f1743c945471548b92c757c0efe8ef75ab89..0f1ea10b1befeabcde561c5f92d9f993b8b35722 100644 (file)
--- a/src/glut/glx/glut_fullscrn.c
+++ b/src/glut/glx/glut_fullscrn.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or 
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdio.h>  /* SunOS multithreaded assert() needs <stdio.h>.  Lame. */
 #include <assert.h>
 

diff --git a/src/glut/glx/glut_gamemode.c b/src/glut/glx/glut_gamemode.c
index b685ce33e2afea87d4dc0414a49b1e396eee612e..004f325a0618b8364300d16cdeb1cf0c5254c86e 100644 (file)
--- a/src/glut/glx/glut_gamemode.c
+++ b/src/glut/glx/glut_gamemode.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/glut/glx/glut_init.c b/src/glut/glx/glut_init.c
index b9d2fde3f3444f09d37e2575bebdb20ff8d9c478..d4d0e8a9783b3824678dd8eba240aa13f62047c2 100644 (file)
--- a/src/glut/glx/glut_init.c
+++ b/src/glut/glx/glut_init.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/src/glut/glx/glut_input.c b/src/glut/glx/glut_input.c
index bc93d5e515156e06e7c9ab5d1bed8ccc7b479fa7..d012c5ee16abf822dd7d7da1229b4de3d3026f1e 100644 (file)
--- a/src/glut/glx/glut_input.c
+++ b/src/glut/glx/glut_input.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/glut/glx/glut_menu.c b/src/glut/glx/glut_menu.c
index 2af3482afc0e7be3fae8438b49a0c13f1c1de9da..0c36d348f46b9e0e48b3a60b5850be6ed30f756b 100644 (file)
--- a/src/glut/glx/glut_menu.c
+++ b/src/glut/glx/glut_menu.c
@@ -9,6 +9,10 @@
    the menuing functionality implemented.  This file is used only by
    the X Window System version of GLUT. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/src/glut/glx/glut_menu2.c b/src/glut/glx/glut_menu2.c
index 93119b540e30341235a8f2270b87b8ee86451136..d02cee4ac151fc3af30d9262ba0399b417b82faf 100644 (file)
--- a/src/glut/glx/glut_menu2.c
+++ b/src/glut/glx/glut_menu2.c
@@ -12,6 +12,10 @@
    the menuing functionality implemented.  This file is used only by
    the X Window System version of GLUT. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/src/glut/glx/glut_overlay.c b/src/glut/glx/glut_overlay.c
index 13ece12a159b3daf92c3f90d87f10824c54a56bb..cc3c8ced6417d99c8aea888cef31ce10578f4c1e 100644 (file)
--- a/src/glut/glx/glut_overlay.c
+++ b/src/glut/glx/glut_overlay.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/glut/glx/glut_win.c b/src/glut/glx/glut_win.c
index 883bacb087190f7d94cef0b517b0bb6efe9d0548..934144f633eb6394f4e9aa291a3c4c1c81a67f60 100644 (file)
--- a/src/glut/glx/glut_win.c
+++ b/src/glut/glx/glut_win.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/glut/glx/glut_winmisc.c b/src/glut/glx/glut_winmisc.c
index 5a9d199a56e560f2e00f4ab13cd17e4d0fde7b63..60d5a073a89adf2c3fa3dff6e114e70e0c60733c 100644 (file)
--- a/src/glut/glx/glut_winmisc.c
+++ b/src/glut/glx/glut_winmisc.c
@@ -5,6 +5,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/glut/glx/glutint.h b/src/glut/glx/glutint.h
index 71dceeceeeecef67daa4c9d0cc52d23d14d4239f..f54ca0bd1649bb87cb39681c79a463e28b9651b8 100644 (file)
--- a/src/glut/glx/glutint.h
+++ b/src/glut/glx/glutint.h
@@ -7,6 +7,10 @@
    and is provided without guarantee or warrantee expressed or
    implied. This program is -not- in the public domain. */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #if defined(__CYGWIN32__)
 #include <sys/time.h>
 #endif

diff --git a/src/glut/glx/layerutil.h b/src/glut/glx/layerutil.h
index 346107740909e7ec7782950b9f6a401bdbab7091..8f580afe3b7a3b5bea06eeef044e987e79a78e8e 100644 (file)
--- a/src/glut/glx/layerutil.h
+++ b/src/glut/glx/layerutil.h
@@ -9,6 +9,10 @@
 
 /* Based on XLayerUtil.h: Revision: 1.3 */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
+
 #if !defined(_WIN32)
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h
index 28e53659f006a7a3fb4a93f2fd57b25e23271f54..99a6400aad449df57410d225e9d888bd2afaafec 100644 (file)
--- a/src/mesa/drivers/x11/glxheader.h
+++ b/src/mesa/drivers/x11/glxheader.h
@@ -1,4 +1,4 @@
-/* $Id: glxheader.h,v 1.1 1999/11/11 01:29:28 brianp Exp $ */
+/* $Id: glxheader.h,v 1.2 2000/08/22 13:31:04 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -28,6 +28,9 @@
 #ifndef GLX_HEADER_H
 #define GLX_HEADER_H
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "conf.h"

diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index 27b877dbabeea83cc3b975f3ce08406eb5d23a8f..e0f457a354fa9c22f5bac9e9d3e9202686c5d580 100644 (file)
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,4 +1,4 @@
-/* $Id: xfonts.c,v 1.8 2000/08/13 03:57:21 brianp Exp $ */
+/* $Id: xfonts.c,v 1.9 2000/08/22 13:31:04 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -29,6 +29,9 @@
  * Copyright (C) 1995 Thorsten.Ohl @ Physik.TH-Darmstadt.de
  */
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "conf.h"

diff --git a/src/mesa/drivers/x11/xfonts.h b/src/mesa/drivers/x11/xfonts.h
index 9cbe11f7bb2411d8cc0754e5030ae0f7ad0486f6..712c9d4c321a05f3b2c9f2513848bf0b7660d613 100644 (file)
--- a/src/mesa/drivers/x11/xfonts.h
+++ b/src/mesa/drivers/x11/xfonts.h
@@ -1,4 +1,4 @@
-/* $Id: xfonts.h,v 1.1 2000/04/19 01:44:02 brianp Exp $ */
+/* $Id: xfonts.h,v 1.2 2000/08/22 13:31:04 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -28,6 +28,9 @@
 #ifndef XFONTS_H
 #define XFONTS_H
 
+#ifdef __VMS
+#include <GL/vms_x_fix.h>
+#endif
 
 #include <X11/Xlib.h>
 

diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index 78c3b434808f806b74a200f9ab5f4ac10bd5bf90..e532df4c528f3c7dfada4e67ac53a54b4a45321c 100644 (file)
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -1,6 +1,6 @@
 # Makefile for core library for VMS
 # contributed by Jouk Jansen  joukj@crys.chem.uva.nl
-# Last revision : 3 May 1999
+# Last revision : 22 August 2000
 
 .first
        define gl [-.include.gl]
@@ -13,11 +13,11 @@ VPATH = RCS
 
 INCDIR = [-.include]
 LIBDIR = [-.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(FBIND=1)
+CFLAGS = /include=($(INCDIR),[])/define=(FBIND=1)/name=(as_is,short)
 
 CORE_SOURCES = aatriangle.c accum.c alpha.c alphabuf.c attrib.c \
 bitmap.c blend.c buffers.c clip.c colortab.c context.c copypix.c depth.c \
-dispatch.c \
+dispatch.c convolve.c \
 dlist.c drawpix.c enable.c eval.c feedback.c fog.c \
 get.c hash.c hint.c image.c imaging.c light.c lines.c logic.c masking.c matrix.c \
 mem.c glapi.c glapinoop.c \
@@ -51,7 +51,7 @@ mmath.obj,pb.obj,pixel.obj,points.obj
 
 OBJECTS7=polygon.obj,\
 quads.obj,rastpos.obj,readpix.obj,rect.obj,scissor.obj,shade.obj,span.obj,\
-pixeltex.obj
+pixeltex.obj,convolve.obj
 
 OBJECTS4=stencil.obj,teximage.obj,texobj.obj,texstate.obj,texture.obj,translate.obj,\
 triangle.obj,varray.obj,winpos.obj,vb.obj,vbcull.obj,vbfill.obj,vbrender.obj