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

Timestamp:

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

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/apiext.c (modified) (15 diffs)

trunk/src/opengl/mesa/apiext.c

@@ -1 @@
-/* $Id: apiext.c,v 1.1 2000-02-29 00:49:58 sandervl Exp $ */
+/* $Id: apiext.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 "cva.h"
 #include "image.h"
-#include "types.h"
 #include "varray.h"
 #endif
@@ -427 +427 @@
  */
 
-#define TEXCOORD1(s)                            \
-{                                               \
-   GLuint count;                                \
-   GLfloat *tc;                                 \
-   count = IM->Count;                           \
-   IM->Flag[count] |= IM->TF1[texSet];          \
-   tc = IM->TexCoordPtr[texSet][count];         \
-   ASSIGN_4V(tc, s,0,0,1);                      \
-}
-
-
-#define TEXCOORD2(s,t)                          \
-{                                               \
-   GLuint count;                                \
-   GLfloat *tc;                                 \
-   count = IM->Count;                           \
-   IM->Flag[count] |= IM->TF2[texSet];          \
-   tc = IM->TexCoordPtr[texSet][count];         \
-   ASSIGN_4V(tc, s,t,0,1);                      \
-}
-
-#define TEXCOORD3(s,t,u)                        \
-{                                               \
-   GLuint count;                                \
-   GLfloat *tc;                                 \
-   count = IM->Count;                           \
-   IM->Flag[count] |= IM->TF3[texSet];          \
-   tc = IM->TexCoordPtr[texSet][count];         \
-   ASSIGN_4V(tc, s,t,u,1);                      \
-}
-
-#define TEXCOORD4(s,t,u,v)                      \
-{                                               \
-   GLuint count;                                \
-   GLfloat *tc;                                 \
-   count = IM->Count;                           \
-   IM->Flag[count] |= IM->TF4[texSet];          \
-   tc = IM->TexCoordPtr[texSet][count];         \
-   ASSIGN_4V(tc, s,t,u,v);                      \
+#define TEXCOORD1(s)                            \
+{                                               \
+   GLuint count;                                \
+   GLfloat *tc;                                 \
+   count = IM->Count;                           \
+   IM->Flag[count] |= IM->TF1[texSet];          \
+   tc = IM->TexCoordPtr[texSet][count];         \
+   ASSIGN_4V(tc, s,0,0,1);                      \
+}
+
+
+#define TEXCOORD2(s,t)                          \
+{                                               \
+   GLuint count;                                \
+   GLfloat *tc;                                 \
+   count = IM->Count;                           \
+   IM->Flag[count] |= IM->TF2[texSet];          \
+   tc = IM->TexCoordPtr[texSet][count];         \
+   ASSIGN_4V(tc, s,t,0,1);                      \
+}
+
+#define TEXCOORD3(s,t,u)                        \
+{                                               \
+   GLuint count;                                \
+   GLfloat *tc;                                 \
+   count = IM->Count;                           \
+   IM->Flag[count] |= IM->TF3[texSet];          \
+   tc = IM->TexCoordPtr[texSet][count];         \
+   ASSIGN_4V(tc, s,t,u,1);                      \
+}
+
+#define TEXCOORD4(s,t,u,v)                      \
+{                                               \
+   GLuint count;                                \
+   GLfloat *tc;                                 \
+   count = IM->Count;                           \
+   IM->Flag[count] |= IM->TF4[texSet];          \
+   tc = IM->TexCoordPtr[texSet][count];         \
+   ASSIGN_4V(tc, s,t,u,v);                      \
 }
 
@@ -480 +480 @@
  */
 
-#define CHECK_ARB                                                       \
-   if (target >= GL_TEXTURE0_ARB && target <= GL_TEXTURE1_ARB) {        \
-      texSet = target - GL_TEXTURE0_ARB;                                \
-   }                                                                    \
-   else {                                                               \
-      gl_error(IM->backref, GL_INVALID_ENUM, "glMultiTexCoord(target)");        \
-      return;                                                           \
+#define CHECK_ARB                                                       \
+   if (target >= GL_TEXTURE0_ARB && target <= GL_TEXTURE1_ARB) {        \
+      texSet = target - GL_TEXTURE0_ARB;                                \
+   }                                                                    \
+   else {                                                               \
+      gl_error(IM->backref, GL_INVALID_ENUM, "glMultiTexCoord(target)");        \
+      return;                                                           \
    }
 
@@ -883 +883 @@
 void GLAPIENTRY
 glHistogram(CTX_ARG GLenum target, GLsizei width, GLenum internalFormat,
-             GLboolean sink )
+             GLboolean sink )
 {
    GET_CONTEXT;
@@ -907 +907 @@
 void GLAPIENTRY
 glGetHistogram(CTX_ARG GLenum target, GLboolean reset, GLenum format,
-                GLenum type, GLvoid *values )
+                GLenum type, GLvoid *values )
 {
    GET_CONTEXT;
@@ -1007 +1007 @@
 void GLAPIENTRY
 glConvolutionFilter1D(CTX_ARG GLenum target, GLenum internalFormat, GLsizei width,
-                       GLenum format, GLenum type, const GLvoid *image )
+                       GLenum format, GLenum type, const GLvoid *image )
 {
    GET_CONTEXT;
@@ -1023 +1023 @@
 void GLAPIENTRY
 glConvolutionFilter2D(CTX_ARG GLenum target, GLenum internalFormat, GLsizei width,
-                       GLsizei height, GLenum format, GLenum type,
-                       const GLvoid *image )
+                       GLsizei height, GLenum format, GLenum type,
+                       const GLvoid *image )
 {
    GET_CONTEXT;
@@ -1089 +1089 @@
 void GLAPIENTRY
 glCopyConvolutionFilter1D(CTX_ARG GLenum target, GLenum internalFormat,
-                           GLint x, GLint y, GLsizei width )
+                           GLint x, GLint y, GLsizei width )
 {
    GET_CONTEXT;
@@ -1104 +1104 @@
 void GLAPIENTRY
 glCopyConvolutionFilter2D(CTX_ARG GLenum target, GLenum internalFormat,
-                           GLint x, GLint y, GLsizei width, GLsizei height)
+                           GLint x, GLint y, GLsizei width, GLsizei height)
 {
    GET_CONTEXT;
@@ -1120 +1120 @@
 void GLAPIENTRY
 glGetConvolutionFilter(CTX_ARG GLenum target, GLenum format,
-                        GLenum type, GLvoid *image )
+                        GLenum type, GLvoid *image )
 {
    GET_CONTEXT;
@@ -1158 +1158 @@
 void GLAPIENTRY
 glSeparableFilter2D(CTX_ARG GLenum target, GLenum internalFormat,
-                     GLsizei width, GLsizei height, GLenum format,
-                     GLenum type, const GLvoid *row, const GLvoid *column )
+                     GLsizei width, GLsizei height, GLenum format,
+                     GLenum type, const GLvoid *row, const GLvoid *column )
 {
    GET_CONTEXT;
@@ -1178 +1178 @@
 void GLAPIENTRY
 glGetSeparableFilter(CTX_ARG GLenum target, GLenum format, GLenum type,
-                      GLvoid *row, GLvoid *column, GLvoid *span )
+                      GLvoid *row, GLvoid *column, GLvoid *span )
 {
    GET_CONTEXT;
@@ -1194 +1194 @@
 void GLAPIENTRY
 glCopyColorSubTable(CTX_ARG GLenum target, GLsizei start, GLint x, GLint y,
-                     GLsizei width )
+                     GLsizei width )
 {
    GET_CONTEXT;
@@ -1209 +1209 @@
 void GLAPIENTRY
 glCopyColorTable(CTX_ARG GLenum target, GLenum internalFormat,
-                  GLint x, GLint y, GLsizei width )
+                  GLint x, GLint y, GLsizei width )
 {
    GET_CONTEXT;