summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJouk Jansen <joukj@hrem.stm.tudelft.nl>2005-09-23 07:03:53 +0000
committerJouk Jansen <joukj@hrem.stm.tudelft.nl>2005-09-23 07:03:53 +0000
commitd997b904338bdef2269894d9d2f0cf2e0ed5c209 (patch)
tree0f18687bf27d9af5a39fec5defc6a2f6224014db
parent79b4dbc4961a80e6a88235ae7455ffdcec23e982 (diff)
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 ----------------------------------------------------------------------
-rw-r--r--docs/README.VMS14
-rw-r--r--progs/demos/descrip.mms2
-rw-r--r--progs/tests/descrip.mms2
-rw-r--r--progs/util/descrip.mms2
-rw-r--r--progs/xdemos/descrip.mms2
-rw-r--r--src/glu/mesa/descrip.mms2
-rw-r--r--src/glu/sgi/descrip.mms2
-rw-r--r--src/glut/glx/descrip.mms2
-rw-r--r--src/mesa/array_cache/descrip.mms2
-rw-r--r--src/mesa/drivers/common/descrip.mms2
-rw-r--r--src/mesa/drivers/osmesa/descrip.mms2
-rw-r--r--src/mesa/drivers/x11/descrip.mms2
-rw-r--r--src/mesa/glapi/descrip.mms2
-rw-r--r--src/mesa/main/descrip.mms2
-rw-r--r--src/mesa/main/texobj.c3
-rw-r--r--src/mesa/math/descrip.mms2
-rw-r--r--src/mesa/shader/descrip.mms2
-rw-r--r--src/mesa/shader/grammar/descrip.mms2
-rw-r--r--src/mesa/shader/slang/descrip.mms2
-rw-r--r--src/mesa/swrast/descrip.mms2
-rw-r--r--src/mesa/swrast_setup/descrip.mms2
-rw-r--r--src/mesa/tnl/descrip.mms2
22 files changed, 33 insertions, 24 deletions
diff --git a/docs/README.VMS b/docs/README.VMS
index c435727c04..6b02909d5b 100644
--- 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 cc9350ce66..a374fdf13d 100644
--- 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 b0ff2610d1..b6ba3e1aeb 100644
--- 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 41b1248157..21dec4b9be 100644
--- 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 77aff8b0c4..aa74daff59 100644
--- 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 16a1e61536..2b3f64d8bc 100644
--- 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 1f795d8480..5abc8b2e04 100644
--- 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 5a536aa872..2e858309b6 100644
--- 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 3555f83d8e..0607a01d1f 100644
--- 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 aa4b8ae211..f923d7478f 100644
--- 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 64dc041f9f..4035b24e4e 100644
--- 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 69d14e36c6..6c6184b2c3 100644
--- 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 20573b9ac9..f17e5329b6 100644
--- 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 a7a5966ca9..2f968ce962 100644
--- 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 3c74e74872..c4cfe3310c 100644
--- 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 86eaf0e467..a3f20c2f25 100644
--- 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 e52479c9a6..94533b35f0 100644
--- 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 b6736af15c..f7fbee96bc 100644
--- 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 6f2b90296c..eddf39cada 100644
--- 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 9a89f86a69..9c45bff8f6 100644
--- 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 3b8af930ce..e5e48afb3d 100644
--- 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 a77d66ca34..70c1606853 100644
--- 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 \