Changeset 3597 for trunk/src/opengl/mesa/mmath.h

Timestamp:

May 23, 2000, 10:35:01 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/mmath.h (modified) (11 diffs)

trunk/src/opengl/mesa/mmath.h

@@ -1 @@
-/* $Id: mmath.h,v 1.1 2000-02-29 00:48:34 sandervl Exp $ */
+/* $Id: mmath.h,v 1.2 2000-05-23 20:34:53 jeroen Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
@@ -24 +24 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/* $XFree86: xc/lib/GL/mesa/src/mmath.h,v 1.2 1999/04/04 00:20:28 dawes Exp $ */
-
-
-
 
 
@@ -40 +36 @@
 #define MMATH_H
 
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
-#ifndef XFree86Server
-#include <math.h>
-#else
-#include "GL/xf86glx.h"
-#endif
+
+#include "glheader.h"
+
 
 /*
@@ -74 +64 @@
  */
 #if !defined(NO_FAST_MATH)
-#define START_FAST_MATH(x)                                      \
+#define START_FAST_MATH(x)                  \
    {                                                            \
       static fpu_control_t mask = _FPU_SINGLE | _FPU_MASK_IM    \
@@ -98 +88 @@
    }
 
+#define HAVE_FAST_MATH
+
+#elif defined(__WATCOMC__) && !defined(NO_FAST_MATH)
+
+/* This is the watcom specific inline assembly version of setcw and getcw */
+
+void START_FAST_MATH2(unsigned short *x);
+#pragma aux START_FAST_MATH2 =          \
+    "fstcw   word ptr [esi]"            \
+    "or      word ptr [esi], 0x3f"      \
+    "fldcw   word ptr [esi]"            \
+    parm [esi]                          \
+    modify exact [];
+
+void END_FAST_MATH2(unsigned short *x);
+#pragma aux END_FAST_MATH2 =            \
+    "fldcw   word ptr [esi]"            \
+    parm [esi]                          \
+    modify exact [];
+
+#define START_FAST_MATH(x)  START_FAST_MATH2(& x)
+#define END_FAST_MATH(x)  END_FAST_MATH2(& x)
+
+/*
+__inline START_FAST_MATH(unsigned short x)
+    {
+    _asm {
+        fstcw   ax
+        mov     x , ax
+        or      ax, 0x3f
+        fldcw   ax
+        }
+    }
+
+__inline END_FAST_MATH(unsigned short x)
+    {
+    _asm {
+        fldcw   x
+        }
+    }
+*/
 #define HAVE_FAST_MATH
 
@@ -132 +163 @@
    int r;
    _asm {
-     fld f
-     fistp r
-    }
+         fld f
+         fistp r
+        }
    return r;
 }
-#elif defined(__WIN32OS2__)
+#elif defined(__WATCOMC__)
+long FloatToInt(float f);
+#pragma aux FloatToInt =                \
+        "push   eax"                        \
+        "fistp  dword ptr [esp]"            \
+        "pop    eax"                        \
+        parm [8087]                         \
+        value [eax]                         \
+        modify exact [eax];
+float asm_sqrt (float x);
+#pragma aux asm_sqrt =                  \
+        "fsqrt"                             \
+        parm [8087]                         \
+        value [8087]                        \
+        modify exact [];
+#else
 #define FloatToInt(F) ((int) (F))
 #endif
@@ -145 +191 @@
 
 
-
-
-
 /*
  * Square root
@@ -155 +198 @@
 
 #ifdef FAST_MATH
+#if defined (__WATCOMC__) && defined(USE_X86_ASM)
+#  define GL_SQRT(X)  asm_sqrt(X)
+#else
 #  define GL_SQRT(X)  gl_sqrt(X)
+#endif
 #else
 #  define GL_SQRT(X)  sqrt(X)
@@ -161 +208 @@
 
 
-
 /*
  * Normalize a 3-element vector to unit length.
  */
-#define NORMALIZE_3FV( V )                      \
-do {                                            \
-   GLdouble len = LEN_SQUARED_3FV(V);           \
-   if (len > 1e-50) {                           \
-      len = 1.0 / GL_SQRT(len);                 \
-      V[0] = (GLfloat) (V[0] * len);            \
-      V[1] = (GLfloat) (V[1] * len);            \
-      V[2] = (GLfloat) (V[2] * len);            \
-   }                                            \
+#define NORMALIZE_3FV( V )                      \
+do {                                            \
+   GLdouble len = LEN_SQUARED_3FV(V);           \
+   if (len > 1e-50) {                           \
+      len = 1.0 / GL_SQRT(len);                 \
+      V[0] = (GLfloat) (V[0] * len);            \
+      V[1] = (GLfloat) (V[1] * len);            \
+      V[2] = (GLfloat) (V[2] * len);            \
+   }                                            \
 } while(0)
 
@@ -194 +240 @@
 #define IEEE_ONE 0x3f7f0000
 
-#define CLAMP_FLOAT_COLOR(f)                    \
-        do {                                    \
-           if (*(GLuint *)&f >= IEEE_ONE)       \
-              f = (*(GLint *)&f < 0) ? 0 : 1;   \
-        } while(0)
+#define CLAMP_FLOAT_COLOR(f)                    \
+        do {                                    \
+           if (*(GLuint *)&f >= IEEE_ONE)       \
+              f = (*(GLint *)&f < 0) ? 0 : 1;   \
+        } while(0)
 
 #define CLAMP_FLOAT_COLOR_VALUE(f)              \
@@ -283 +329 @@
 
 
-extern void gl_init_math(void);
-
-
-#endif
+extern void _mesa_init_math(void);
+
+
+#endif