Module Name: xsrc
Committed By: matt
Date: Mon Feb 13 16:59:52 UTC 2012
Modified Files:
xsrc/external/mit/MesaLib/dist/include/GL: glu.h
xsrc/external/mit/MesaLib/dist/src/mesa/math: m_norm_tmp.h
xsrc/external/mit/fontconfig/dist/src: fcmatch.c
xsrc/external/mit/libX11/dist/src/xcms: cmsTrig.c
Log Message:
Deal with the limited range of VAX floating point numbers when compiling
for VAX.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/MesaLib/dist/include/GL/glu.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/math/m_norm_tmp.h
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcmatch.c
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/include/GL/glu.h
diff -u xsrc/external/mit/MesaLib/dist/include/GL/glu.h:1.1.1.2 xsrc/external/mit/MesaLib/dist/include/GL/glu.h:1.2
--- xsrc/external/mit/MesaLib/dist/include/GL/glu.h:1.1.1.2 Thu Jun 11 00:50:15 2009
+++ xsrc/external/mit/MesaLib/dist/include/GL/glu.h Mon Feb 13 16:59:51 2012
@@ -281,7 +281,11 @@ typedef GLUquadric GLUquadricObj;
typedef GLUtesselator GLUtesselatorObj;
typedef GLUtesselator GLUtriangulatorObj;
+#ifdef __vax__
+#define GLU_TESS_MAX_COORD 1.0e19
+#else
#define GLU_TESS_MAX_COORD 1.0e150
+#endif
/* Internal convenience typedefs */
typedef void (GLAPIENTRYP _GLUfuncptr)();
Index: xsrc/external/mit/MesaLib/dist/src/mesa/math/m_norm_tmp.h
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/math/m_norm_tmp.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/mesa/math/m_norm_tmp.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/math/m_norm_tmp.h:1.1.1.1 Tue Jul 29 05:08:51 2008
+++ xsrc/external/mit/MesaLib/dist/src/mesa/math/m_norm_tmp.h Mon Feb 13 16:59:51 2012
@@ -321,7 +321,7 @@ TAG(normalize_normals)( const GLmatrix *
STRIDE_LOOP {
const GLfloat x = from[0], y = from[1], z = from[2];
GLdouble len = x * x + y * y + z * z;
- if (len > 1e-50) {
+ if (len > 1e-20) {
len = INV_SQRTF(len);
out[i][0] = (GLfloat)(x * len);
out[i][1] = (GLfloat)(y * len);
Index: xsrc/external/mit/fontconfig/dist/src/fcmatch.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.1.1.2 xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcmatch.c:1.1.1.2 Sun Nov 21 06:35:32 2010
+++ xsrc/external/mit/fontconfig/dist/src/fcmatch.c Mon Feb 13 16:59:51 2012
@@ -26,6 +26,7 @@
#include <string.h>
#include <ctype.h>
#include <stdio.h>
+#include <float.h>
static double
FcCompareNumber (FcValue *value1, FcValue *value2)
@@ -285,9 +286,9 @@ FcCompareValueList (FcObject object,
return FcTrue;
}
- best = 1e99;
- bestStrong = 1e99;
- bestWeak = 1e99;
+ best = DBL_MAX;
+ bestStrong = DBL_MAX;
+ bestWeak = DBL_MAX;
j = 1;
for (v1 = v1orig; v1; v1 = FcValueListNext(v1))
{
Index: xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c
diff -u xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c:1.1.1.3 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c:1.2
--- xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c:1.1.1.3 Sat May 22 01:22:13 2010
+++ xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c Mon Feb 13 16:59:51 2012
@@ -71,7 +71,11 @@ _XcmsModuloF(
#define XCMS_SIXTHPI 0.523598775598298820
#define XCMS_RADIANS(d) ((d) * XCMS_PI / 180.0)
#define XCMS_DEGREES(r) ((r) * 180.0 / XCMS_PI)
+#ifdef __vax__
+#define XCMS_X6_UNDERFLOWS (3.784659e-07) /* X**6 almost underflows*/
+#else
#define XCMS_X6_UNDERFLOWS (4.209340e-52) /* X**6 almost underflows */
+#endif
#define XCMS_X16_UNDERFLOWS (5.421010e-20) /* X**16 almost underflows*/
#define XCMS_CHAR_BIT 8
#define XCMS_LONG_MAX 0x7FFFFFFF
