Changeset 2962 for trunk/src/opengl/mesa/api2.c

Timestamp:

Mar 1, 2000, 7:50:02 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/api2.c (modified) (8 diffs)

trunk/src/opengl/mesa/api2.c

@@ -1 @@
-/* $Id: api2.c,v 1.1 2000-02-29 00:49:58 sandervl Exp $ */
+/* $Id: api2.c,v 1.2 2000-03-01 18:49:23 jeroen Exp $ */
 
 /*
@@ -37 +37 @@
 #endif
 #include "api.h"
+#include "types.h"
 #include "context.h"
 #include "varray.h"
@@ -43 +44 @@
 #include "matrix.h"
 #include "teximage.h"
-#include "types.h"
 #include "vb.h"
 #endif
@@ -663 +663 @@
 }
 
-#define TEXCOORD1(s)                            \
-{                                               \
-   GLuint count;                                \
-   GLfloat *tc;                                 \
-   GET_IMMEDIATE;                               \
-   count = IM->Count;                           \
-   IM->Flag[count] |= VERT_TEX0_1;              \
-   tc = IM->TexCoord[0][count];                 \
-   ASSIGN_4V(tc,s,0,0,1);                       \
-}
-
-#define TEXCOORD2(s,t)                          \
-{                                               \
-   GLuint count;                                \
-   GLfloat *tc;                                 \
-   GET_IMMEDIATE;                               \
-   count = IM->Count;                           \
-   IM->Flag[count] |= VERT_TEX0_12;             \
-   tc = IM->TexCoord[0][count];                 \
-   ASSIGN_4V(tc, s,t,0,1);                      \
-}
-
-#define TEXCOORD3(s,t,u)                        \
-{                                               \
-   GLuint count;                                \
-   GLfloat *tc;                                 \
-   GET_IMMEDIATE;                               \
-   count = IM->Count;                           \
-   IM->Flag[count] |= VERT_TEX0_123;            \
-   tc = IM->TexCoord[0][count];                 \
-   ASSIGN_4V(tc, s,t,u,1);                      \
-}
-
-#define TEXCOORD4(s,t,u,v)                      \
-{                                               \
-   GLuint count;                                \
-   GLfloat *tc;                                 \
-   GET_IMMEDIATE;                               \
-   count = IM->Count;                           \
-   IM->Flag[count] |= VERT_TEX0_1234;           \
-   tc = IM->TexCoord[0][count];                 \
-   ASSIGN_4V(tc, s,t,u,v);                      \
+#define TEXCOORD1(s)                            \
+{                                               \
+   GLuint count;                                \
+   GLfloat *tc;                                 \
+   GET_IMMEDIATE;                               \
+   count = IM->Count;                           \
+   IM->Flag[count] |= VERT_TEX0_1;              \
+   tc = IM->TexCoord[0][count];                 \
+   ASSIGN_4V(tc,s,0,0,1);                       \
+}
+
+#define TEXCOORD2(s,t)                          \
+{                                               \
+   GLuint count;                                \
+   GLfloat *tc;                                 \
+   GET_IMMEDIATE;                               \
+   count = IM->Count;                           \
+   IM->Flag[count] |= VERT_TEX0_12;             \
+   tc = IM->TexCoord[0][count];                 \
+   ASSIGN_4V(tc, s,t,0,1);                      \
+}
+
+#define TEXCOORD3(s,t,u)                        \
+{                                               \
+   GLuint count;                                \
+   GLfloat *tc;                                 \
+   GET_IMMEDIATE;                               \
+   count = IM->Count;                           \
+   IM->Flag[count] |= VERT_TEX0_123;            \
+   tc = IM->TexCoord[0][count];                 \
+   ASSIGN_4V(tc, s,t,u,1);                      \
+}
+
+#define TEXCOORD4(s,t,u,v)                      \
+{                                               \
+   GLuint count;                                \
+   GLfloat *tc;                                 \
+   GET_IMMEDIATE;                               \
+   count = IM->Count;                           \
+   IM->Flag[count] |= VERT_TEX0_1234;           \
+   tc = IM->TexCoord[0][count];                 \
+   ASSIGN_4V(tc, s,t,u,v);                      \
 }
 
@@ -1146 +1146 @@
  *     the incoming vertices.
  */
-#define VERTEX2(IM, x,y)                        \
-{                                               \
-   GLuint count = IM->Count++;                  \
-   GLfloat *dest = IM->Obj[count];              \
-   IM->Flag[count] |= VERT_OBJ_2;               \
-   ASSIGN_4V(dest, x, y, 0, 1);                 \
-   if (dest == IM->Obj[VB_MAX-1])               \
-      IM->maybe_transform_vb( IM );             \
-}
-
-#define VERTEX3(IM,x,y,z)                       \
-{                                               \
-   GLuint count = IM->Count++;                  \
-   GLfloat *dest = IM->Obj[count];              \
-   IM->Flag[count] |= VERT_OBJ_23;              \
-   ASSIGN_4V(dest, x, y, z, 1);                 \
-   if (dest == IM->Obj[VB_MAX-1])               \
-      IM->maybe_transform_vb( IM );             \
-}
-
-#define VERTEX4(IM, x,y,z,w)                    \
-{                                               \
-   GLuint count = IM->Count++;                  \
-   GLfloat *dest = IM->Obj[count];              \
-   IM->Flag[count] |= VERT_OBJ_234;             \
-   ASSIGN_4V(dest, x, y, z, w);                 \
-   if (dest == IM->Obj[VB_MAX-1])               \
-      IM->maybe_transform_vb( IM );             \
+#define VERTEX2(IM, x,y)                        \
+{                                               \
+   GLuint count = IM->Count++;                  \
+   GLfloat *dest = IM->Obj[count];              \
+   IM->Flag[count] |= VERT_OBJ_2;               \
+   ASSIGN_4V(dest, x, y, 0, 1);                 \
+   if (dest == IM->Obj[VB_MAX-1])               \
+      IM->maybe_transform_vb( IM );             \
+}
+
+#define VERTEX3(IM,x,y,z)                       \
+{                                               \
+   GLuint count = IM->Count++;                  \
+   GLfloat *dest = IM->Obj[count];              \
+   IM->Flag[count] |= VERT_OBJ_23;              \
+   ASSIGN_4V(dest, x, y, z, 1);                 \
+   if (dest == IM->Obj[VB_MAX-1])               \
+      IM->maybe_transform_vb( IM );             \
+}
+
+#define VERTEX4(IM, x,y,z,w)                    \
+{                                               \
+   GLuint count = IM->Count++;                  \
+   GLfloat *dest = IM->Obj[count];              \
+   IM->Flag[count] |= VERT_OBJ_234;             \
+   ASSIGN_4V(dest, x, y, z, w);                 \
+   if (dest == IM->Obj[VB_MAX-1])               \
+      IM->maybe_transform_vb( IM );             \
 }
 
@@ -1324 +1324 @@
    GET_IMMEDIATE;
    VERTEX4( IM,
-            (GLfloat) v[0], (GLfloat) v[1],
-            (GLfloat) v[2], (GLfloat) v[3] );
+            (GLfloat) v[0], (GLfloat) v[1],
+            (GLfloat) v[2], (GLfloat) v[3] );
 }
 
@@ -1340 +1340 @@
    GET_IMMEDIATE;
    VERTEX4( IM,
-            (GLfloat) v[0], (GLfloat) v[1],
-            (GLfloat) v[2], (GLfloat) v[3] );
+            (GLfloat) v[0], (GLfloat) v[1],
+            (GLfloat) v[2], (GLfloat) v[3] );
 }
 
@@ -1349 +1349 @@
    GET_IMMEDIATE;
    VERTEX4( IM,
-            (GLfloat) v[0], (GLfloat) v[1],
-            (GLfloat) v[2], (GLfloat) v[3] );
+            (GLfloat) v[0], (GLfloat) v[1],
+            (GLfloat) v[2], (GLfloat) v[3] );
 }