Committing in .

 1) change compilation on VMS to use IEEE floating points

 2) one more problem with _mesa_sprintf solved

 Modified Files:
 	Mesa/docs/README.VMS Mesa/progs/demos/descrip.mms
 	Mesa/progs/tests/descrip.mms Mesa/progs/util/descrip.mms
 	Mesa/progs/xdemos/descrip.mms Mesa/src/glu/mesa/descrip.mms
 	Mesa/src/glu/sgi/descrip.mms Mesa/src/glut/glx/descrip.mms
 	Mesa/src/mesa/array_cache/descrip.mms
 	Mesa/src/mesa/drivers/common/descrip.mms
 	Mesa/src/mesa/drivers/osmesa/descrip.mms
 	Mesa/src/mesa/drivers/x11/descrip.mms
 	Mesa/src/mesa/glapi/descrip.mms Mesa/src/mesa/main/descrip.mms
 	Mesa/src/mesa/main/texobj.c Mesa/src/mesa/math/descrip.mms
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/shader/grammar/descrip.mms
 	Mesa/src/mesa/shader/slang/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms
 	Mesa/src/mesa/swrast_setup/descrip.mms
 	Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------

diff --git a/docs/README.VMS b/docs/README.VMS
index c435727c04b0e47203cc0fdae6942455c132474c..6b02909d5b2a8e998001f5ca714cfdefd88611df 100644 (file)
--- a/docs/README.VMS
+++ b/docs/README.VMS
@@ -26,7 +26,13 @@ On Alpha platforms at default a sharable images for the libraries are created.
 To get a static library make it by typing MMS/MACRO=(NOSHARE=1).
 On VAX platforms only static libraries can be build.
 
-
-You may want to compile Mesa to use IEEE floating point arithmetic, instead
-of VAX floating point by specifying the /float=IEEE flag to the compiler.
-For more information see https://bugs.freedesktop.org/show_bug.cgi?id=4270
+23-sep-2005
+changed default compilation to use /float=ieee/ieee=denorm. The reason for 
+this is that it makes Mesa on OpenVMS better compatible with other platforms
+and other packages for VMS that I maintain.
+For more information see
+      http://nchrem.tnw.tudelft.nl/openvms
+      https://bugs.freedesktop.org/show_bug.cgi?id=4270
+You may want to compile Mesa to use VAX-floating point arithmetic, instead
+of IEEE floating point by removing the /float=IEEE/denorm flag from the
+compiler options in the descrip.mms files.

diff --git a/progs/demos/descrip.mms b/progs/demos/descrip.mms
index cc9350ce6657d392cc3eac82a0a8c3aa4b6a76e9..a374fdf13d0db5ebf1143354be15f988b11ab495 100644 (file)
--- a/progs/demos/descrip.mms
+++ b/progs/demos/descrip.mms
@@ -10,7 +10,7 @@
 ##### MACROS #####
 
 INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)
+CFLAGS =/include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
 
 .ifdef SHARE
 GL_LIBS = $(XLIBS)

diff --git a/progs/tests/descrip.mms b/progs/tests/descrip.mms
index b0ff2610d1855219ceebb51f2c0d9e0dfd49cc48..b6ba3e1aebb3fce8586e88138e12302c26125278 100644 (file)
--- a/progs/tests/descrip.mms
+++ b/progs/tests/descrip.mms
@@ -10,7 +10,7 @@
 ##### MACROS #####
 
 INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)
+CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
 
 .ifdef SHARE
 GL_LIBS = $(XLIBS)

diff --git a/progs/util/descrip.mms b/progs/util/descrip.mms
index 41b1248157cf477e3a12f63fb9a660ed486a156f..21dec4b9be4cef8cc309350072b775987c387c08 100644 (file)
--- a/progs/util/descrip.mms
+++ b/progs/util/descrip.mms
@@ -10,7 +10,7 @@
 ##### MACROS #####
 
 INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)
+CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
 
 .ifdef SHARE
 GL_LIBS = $(XLIBS)

diff --git a/progs/xdemos/descrip.mms b/progs/xdemos/descrip.mms
index 77aff8b0c4a7ea03100cb5cedd79b5a9faaeb39b..aa74daff599088f3bf7def2f9005bd35e8c03b02 100644 (file)
--- a/progs/xdemos/descrip.mms
+++ b/progs/xdemos/descrip.mms
@@ -10,7 +10,7 @@
 ##### MACROS #####
 
 INCDIR = ([--.include],[-.util])
-CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/nowarn
+CFLAGS = /include=$(INCDIR)/prefix=all/name=(as_is,short)/nowarn/float=ieee/ieee=denorm
 
 .ifdef SHARE
 GL_LIBS = $(XLIBS)

diff --git a/src/glu/mesa/descrip.mms b/src/glu/mesa/descrip.mms
index 16a1e615362a450b1ef08edd2943f60943a0143e..2b3f64d8bcc5a7841707fc1f7e4fb19e96df7424 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)/name=(as_is,short)
+CFLAGS = /include=$(INCDIR)/define=(FBIND=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 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/glu/sgi/descrip.mms b/src/glu/sgi/descrip.mms
index 1f795d8480fae6d520bd8470ecc6f56dd12834a9..5abc8b2e049519efea51dff2801cb1dcedc942dd 100644 (file)
--- a/src/glu/sgi/descrip.mms
+++ b/src/glu/sgi/descrip.mms
@@ -13,7 +13,7 @@ VPATH = RCS
 INCDIR =([-.include],[.include],[.internals],[.libnurbs.internals],\
        [.libnurbs.interface],[.libnurbs.nurbtess])
 LIBDIR = [---.lib]
-CFLAGS = /include=$(INCDIR)/name=(as_is,short)
+CFLAGS = /include=$(INCDIR)/name=(as_is,short)/float=ieee/ieee=denorm
 
 LU_OBJECTS=\
        [.libutil]error.obj,    \

diff --git a/src/glut/glx/descrip.mms b/src/glut/glx/descrip.mms
index 5a536aa872586bb1de8c89f4a381b1e13549607b..2e858309b62f2009117f9c2bfd7dd41b5f03a607 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/name=(as_is,short)
+CFLAGS = /nowarn/include=$(INCDIR)/prefix=all/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = \
 glut_8x13.c \

diff --git a/src/mesa/array_cache/descrip.mms b/src/mesa/array_cache/descrip.mms
index 3555f83d8ed510e608f4bc380fdca7a82aa712c5..0607a01d1f9dcac0f4582a7e9257eef90f1e119f 100644 (file)
--- a/src/mesa/array_cache/descrip.mms
+++ b/src/mesa/array_cache/descrip.mms
@@ -15,7 +15,7 @@ VPATH = RCS
 
 INCDIR = [---.include],[-.main],[-.glapi]
 LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = ac_context.c ac_import.c
 

diff --git a/src/mesa/drivers/common/descrip.mms b/src/mesa/drivers/common/descrip.mms
index aa4b8ae2118c075137c4c691173e596dc1a771a2..f923d7478f98df4d7ed320821f54dad310327fdb 100644 (file)
--- a/src/mesa/drivers/common/descrip.mms
+++ b/src/mesa/drivers/common/descrip.mms
@@ -15,7 +15,7 @@ VPATH = RCS
 
 INCDIR = [----.include],[--.main],[--.glapi],[--.shader]
 LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = driverfuncs.c
 

diff --git a/src/mesa/drivers/osmesa/descrip.mms b/src/mesa/drivers/osmesa/descrip.mms
index 64dc041f9f942f11d5b622e354d394e3ed4f8708..4035b24e4e166b3bbb95fe666d76e47c08456a6e 100644 (file)
--- a/src/mesa/drivers/osmesa/descrip.mms
+++ b/src/mesa/drivers/osmesa/descrip.mms
@@ -19,7 +19,7 @@ VPATH = RCS
 
 INCDIR = [----.include],[--.main],[--.glapi]
 LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = osmesa.c
 

diff --git a/src/mesa/drivers/x11/descrip.mms b/src/mesa/drivers/x11/descrip.mms
index 69d14e36c64a5d7ff30d5dd101d2c264080829b1..6c6184b2c3c1ae7b8521e194935d3dc69d8ed54d 100644 (file)
--- a/src/mesa/drivers/x11/descrip.mms
+++ b/src/mesa/drivers/x11/descrip.mms
@@ -19,7 +19,7 @@ VPATH = RCS
 
 INCDIR = [----.include],[--.main],[--.glapi]
 LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS =/include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = fakeglx.c glxapi.c xfonts.c xm_api.c xm_dd.c xm_line.c xm_span.c\
        xm_tri.c xm_buffer.c

diff --git a/src/mesa/glapi/descrip.mms b/src/mesa/glapi/descrip.mms
index 20573b9ac9ade466f0b37477cb9ab2c4156f39ac..f17e5329b60b5d0915d3083408426f69b12b805f 100644 (file)
--- a/src/mesa/glapi/descrip.mms
+++ b/src/mesa/glapi/descrip.mms
@@ -13,7 +13,7 @@ VPATH = RCS
 
 INCDIR = [---.include],[-.main]
 LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = glapi.c glthread.c
 

diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index a7a5966ca98f9e316a89aebc7cc5d0b374795a06..2f968ce962326139257d5cc1e5d3ce259476f90c 100644 (file)
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -15,7 +15,7 @@ VPATH = RCS
 
 INCDIR = [---.include],[-.glapi],[-.shader]
 LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES =accum.c \
        api_arrayelt.c \

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 3c74e748722bc66a778f899984126c4c7900aa83..c4cfe3310c85babd555f073414b5a1b39f9d73cd 100644 (file)
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -40,6 +40,9 @@
 #include "texobj.h"
 #include "mtypes.h"
 
+#ifdef __VMS
+#define _mesa_sprintf sprintf
+#endif
 
 /**********************************************************************/
 /** \name Internal functions */

diff --git a/src/mesa/math/descrip.mms b/src/mesa/math/descrip.mms
index 86eaf0e467dacbd33db55ae13d2d965e93619f0c..a3f20c2f25c3dea093999df3580481ae3161fb1e 100644 (file)
--- a/src/mesa/math/descrip.mms
+++ b/src/mesa/math/descrip.mms
@@ -14,7 +14,7 @@ VPATH = RCS
 
 INCDIR = [---.include],[-.main],[-.glapi]
 LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c\
        m_translate.c m_vector.c m_xform.c

diff --git a/src/mesa/shader/descrip.mms b/src/mesa/shader/descrip.mms
index e52479c9a6998836aec2536e69590ae8cec0acbd..94533b35f04286fb9e97308e5a81cbd46e699fd0 100644 (file)
--- a/src/mesa/shader/descrip.mms
+++ b/src/mesa/shader/descrip.mms
@@ -16,7 +16,7 @@ VPATH = RCS
 
 INCDIR = [---.include],[.grammar],[-.main],[-.glapi],[.slang]
 LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = \
        atifragshader.c \

diff --git a/src/mesa/shader/grammar/descrip.mms b/src/mesa/shader/grammar/descrip.mms
index b6736af15ccfae08384bfc44cf1df68007c81981..f7fbee96bcd9480bfeade542ca6a321d2bff4aa9 100644 (file)
--- a/src/mesa/shader/grammar/descrip.mms
+++ b/src/mesa/shader/grammar/descrip.mms
@@ -16,7 +16,7 @@ VPATH = RCS
 
 INCDIR = [----.include],[],[--.main],[--.glapi],[-.slang]
 LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = grammar_mesa.c
 

diff --git a/src/mesa/shader/slang/descrip.mms b/src/mesa/shader/slang/descrip.mms
index 6f2b90296c5c777099156124c6ca3699e6d2bcef..eddf39cada21568df70c3a79de228535005b04fe 100644 (file)
--- a/src/mesa/shader/slang/descrip.mms
+++ b/src/mesa/shader/slang/descrip.mms
@@ -16,7 +16,7 @@ VPATH = RCS
 
 INCDIR = [----.include],[--.main],[--.glapi],[-.slang],[-.grammar],[-]
 LIBDIR = [----.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = \
        slang_compile.c,slang_preprocess.c

diff --git a/src/mesa/swrast/descrip.mms b/src/mesa/swrast/descrip.mms
index 9a89f86a69b42813302f48a9d17e4677004e51ac..9c45bff8f61c318aa40855b90c1acb8979bf78ef 100644 (file)
--- a/src/mesa/swrast/descrip.mms
+++ b/src/mesa/swrast/descrip.mms
@@ -16,7 +16,7 @@ VPATH = RCS
 
 INCDIR = [---.include],[-.main],[-.glapi],[-.shader]
 LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \
        s_bitmap.c s_blend.c s_buffers.c s_context.c s_copypix.c s_depth.c \

diff --git a/src/mesa/swrast_setup/descrip.mms b/src/mesa/swrast_setup/descrip.mms
index 3b8af930ce1e6dbae8e3144fbf4e396b68e09ea6..e5e48afb3ddc4a2b462c9f6af56fafcf052a3748 100644 (file)
--- a/src/mesa/swrast_setup/descrip.mms
+++ b/src/mesa/swrast_setup/descrip.mms
@@ -17,7 +17,7 @@ VPATH = RCS
 
 INCDIR = [---.include],[-.main],[-.glapi]
 LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = ss_context.c ss_triangle.c
 

diff --git a/src/mesa/tnl/descrip.mms b/src/mesa/tnl/descrip.mms
index a77d66ca34bfee8a3b0e54e48f0fc26106dc7cb3..70c1606853fa81b89d77d7c788f7aa95c5ae3b4f 100644 (file)
--- a/src/mesa/tnl/descrip.mms
+++ b/src/mesa/tnl/descrip.mms
@@ -16,7 +16,7 @@ VPATH = RCS
 
 INCDIR = [---.include],[-.main],[-.glapi],[-.shader]
 LIBDIR = [---.lib]
-CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
+CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm
 
 SOURCES = t_array_api.c t_array_import.c t_context.c \
        t_pipeline.c t_vb_fog.c t_save_api.c t_vtx_api.c \