Changeset 3598 for trunk/src/opengl/mesa/3dfx/fxfasttmp.h

Timestamp:

May 23, 2000, 10:41:28 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/3dfx/fxfasttmp.h (modified) (11 diffs)

trunk/src/opengl/mesa/3dfx/fxfasttmp.h

@@ -3 +3 @@
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
@@ -89 +89 @@
     */
    gl_xform_points3_v16_general(FX_DRIVER_DATA(VB)->verts[0].f,
-                                m,
-                                VB->ObjPtr->start,
-                                VB->ObjPtr->stride,
-                                count);
+                                m,
+                                VB->ObjPtr->start,
+                                VB->ObjPtr->stride,
+                                count);
 
    if (do_clip)
    {
-      VB->ClipAndMask = ~0; 
+      VB->ClipAndMask = ~0;
       VB->ClipOrMask = 0;
       gl_cliptest_points4_v16(FX_DRIVER_DATA(VB)->verts[0].f,
-                              FX_DRIVER_DATA(VB)->verts[count].f,
-                              &(VB->ClipOrMask),
-                              &(VB->ClipAndMask),
-                              VB->ClipMask);
+                              FX_DRIVER_DATA(VB)->verts[count].f,
+                              &(VB->ClipOrMask),
+                              &(VB->ClipAndMask),
+                              VB->ClipMask);
    }
 
@@ -137 +137 @@
  */
 static void TAG(fx_project_vertices)( GLfloat *first,
-                                      GLfloat *last,
-                                      const GLfloat *mat,
-                                      GLuint stride )
+                                      GLfloat *last,
+                                      const GLfloat *mat,
+                                      GLuint stride )
 {
    GLfloat *f;
    VARS_XYZ;
 
-   for ( f = first ; f != last ; STRIDE_F(f, stride)) 
+   for ( f = first ; f != last ; STRIDE_F(f, stride))
    {
-      GLfloat oow = 1.0f/f[3];  /* urp! */
+      GLfloat oow = 1.0f/f[CLIP_WCOORD];        /* urp! */
 
 #if FX_USE_PARGB
@@ -154 +154 @@
 #else
       if (TYPE & SETUP_RGBA) {
-        f[RCOORD]=f[CLIP_R];
+        f[RCOORD]=f[CLIP_R];
       }
 #endif
       if (TYPE & SETUP_TMU1) {
-         f[S1COORD] = f[CLIP_S1] * oow;
-         f[T1COORD] = f[CLIP_T1] * oow;
+         f[S1COORD] = f[CLIP_S1] * oow;
+         f[T1COORD] = f[CLIP_T1] * oow;
       }
 
       if (TYPE & SETUP_TMU0) {
-         f[T0COORD] = f[CLIP_T0] * oow;
-         f[S0COORD] = f[CLIP_S0] * oow;
+         f[T0COORD] = f[CLIP_T0] * oow;
+         f[S0COORD] = f[CLIP_S0] * oow;
       }
 
@@ -174 +174 @@
 
 static void TAG(fx_project_clipped_vertices)( GLfloat *first,
-                                              GLfloat *last,
-                                              const GLfloat *mat,
-                                              GLuint stride,
-                                              const GLubyte *mask )
+                                              GLfloat *last,
+                                              const GLfloat *mat,
+                                              GLuint stride,
+                                              const GLubyte *mask )
 {
    GLfloat *f;
@@ -185 +185 @@
       if (!*mask) {
 
-         GLfloat oow = 1.0f / f[3];
+         GLfloat oow = 1.0f / f[CLIP_WCOORD];
 #if FX_USE_PARGB
         if (TYPE & SETUP_RGBA) {
@@ -197 +197 @@
 #else
         if (TYPE & SETUP_RGBA) {
-          f[RCOORD]=f[CLIP_R];
+          f[RCOORD]=f[CLIP_R];
         }
 #endif
 
-         if (TYPE & SETUP_TMU1) {
-            f[S1COORD] = f[CLIP_S1] * oow;
-            f[T1COORD] = f[CLIP_T1] * oow;
-         }
-
-         if (TYPE & SETUP_TMU0) {
-            f[T0COORD] = f[CLIP_T0] * oow;
-            f[S0COORD] = f[CLIP_S0] * oow;
-         }
-
-         DO_SETUP_XYZ;
-
-         f[OOWCOORD] = oow;
+         if (TYPE & SETUP_TMU1) {
+            f[S1COORD] = f[CLIP_S1] * oow;
+            f[T1COORD] = f[CLIP_T1] * oow;
+         }
+
+         if (TYPE & SETUP_TMU0) {
+            f[T0COORD] = f[CLIP_T0] * oow;
+            f[S0COORD] = f[CLIP_S0] * oow;
+         }
+
+         DO_SETUP_XYZ;
+
+         f[OOWCOORD] = oow;
       }
    }
@@ -224 +224 @@
 #endif
 void TAG(fx_tri_clip)( GLuint **p_elts,
-                       fxVertex *verts,
-                       GLubyte *clipmask,
-                       GLuint *p_next_vert,
-                       GLubyte mask )
+                       fxVertex *verts,
+                       GLubyte *clipmask,
+                       GLuint *p_next_vert,
+                       GLubyte mask )
 {
    GLuint *elts = *p_elts;
@@ -266 +266 @@
 
 static INLINE void TAG(fx_line_clip)( GLuint **p_elts,
-                                      fxVertex *verts,
-                                      GLubyte *clipmask,
-                                      GLuint *p_next_vert,
-                                      GLubyte mask )
+                                      fxVertex *verts,
+                                      GLubyte *clipmask,
+                                      GLuint *p_next_vert,
+                                      GLubyte mask )
 {
    GLuint *elts = *p_elts;
@@ -290 +290 @@
 /* Build a table of functions to clip each primitive type.
  */
-#define LOCAL_VARS                                                      \
-   GLuint *elt = VB->EltPtr->data;                                      \
-   fxVertex *verts = FX_DRIVER_DATA(VB)->verts;                         \
-   GLuint next_vert = VB->Count;                                        \
-   GLuint *out = FX_DRIVER_DATA(VB)->clipped_elements.data;             \
+#define LOCAL_VARS                                                      \
+   GLuint *elt = VB->EltPtr->data;                                      \
+   fxVertex *verts = FX_DRIVER_DATA(VB)->verts;                         \
+   GLuint next_vert = VB->Count;                                        \
+   GLuint *out = FX_DRIVER_DATA(VB)->clipped_elements.data;             \
    GLubyte *mask = VB->ClipMask;                                        \
 
 
-#define POSTFIX                                                 \
-   FX_DRIVER_DATA(VB)->clipped_elements.count =                 \
-          out - FX_DRIVER_DATA(VB)->clipped_elements.data;      \
+#define POSTFIX                                                 \
+   FX_DRIVER_DATA(VB)->clipped_elements.count =                 \
+          out - FX_DRIVER_DATA(VB)->clipped_elements.data;      \
    FX_DRIVER_DATA(VB)->last_vert = &verts[next_vert];
 
 #define INIT(x)
 
-#define RENDER_POINTS(start, count)                     \
-do {                                                    \
-   GLuint i;                                            \
-   for (i = start ; i < count ; i++ )                   \
-      CLIP_POINT( elt[i] );                             \
+#define RENDER_POINTS(start, count)                     \
+do {                                                    \
+   GLuint i;                                            \
+   for (i = start ; i < count ; i++ )                   \
+      CLIP_POINT( elt[i] );                             \
 } while (0)
 
-#define RENDER_LINE(i1, i0)                     \
+#define RENDER_LINE(i1, i0)                     \
    CLIP_LINE(elt[i1], elt[i0])
 
-#define RENDER_TRI(i2, i1, i0, pv, parroty)             \
-do {                                                    \
-   GLuint e2 = elt[i2], e1 = elt[i1], e0 = elt[i0];     \
-   if (parroty) e2 = elt[i1], e1 = elt[i2];             \
-   CLIP_TRIANGLE( e2, e1, e0 );                         \
+#define RENDER_TRI(i2, i1, i0, pv, parroty)             \
+do {                                                    \
+   GLuint e2 = elt[i2], e1 = elt[i1], e0 = elt[i0];     \
+   if (parroty) e2 = elt[i1], e1 = elt[i2];             \
+   CLIP_TRIANGLE( e2, e1, e0 );                         \
 } while (0)
 
-#define RENDER_QUAD(i3, i2, i1, i0, pv)         \
-  CLIP_TRIANGLE(elt[i3], elt[i2], elt[i0]);     \
+#define RENDER_QUAD(i3, i2, i1, i0, pv)         \
+  CLIP_TRIANGLE(elt[i3], elt[i2], elt[i0]);     \
   CLIP_TRIANGLE(elt[i2], elt[i1], elt[i0])
 
@@ -344 +344 @@
    tab->project_clipped_vertices = TAG(fx_project_clipped_vertices);
 
-#if defined(USE_3DNOW_ASM) 
+#if defined(USE_3DNOW_ASM)
    if (gl_x86_cpu_features & GL_CPU_3Dnow) {
       extern void TAG(fx_3dnow_project_vertices)( GLfloat *first,
-                                                  GLfloat *last,
-                                                  const GLfloat *mat,
-                                                  GLuint stride );
+                                                  GLfloat *last,
+                                                  const GLfloat *mat,
+                                                  GLuint stride );
 
       extern void TAG(fx_3dnow_project_clipped_vertices)( GLfloat *first,
-                                                          GLfloat *last,
-                                                          const GLfloat *mat,
-                                                          GLuint stride,
-                                                          const GLubyte *mask );
+                                                          GLfloat *last,
+                                                          const GLfloat *mat,
+                                                          GLuint stride,
+                                                          const GLubyte *mask );
 
       tab->project_vertices = TAG(fx_3dnow_project_vertices);