Changeset 3079 for trunk/src/opengl/mesa

Timestamp:

Mar 11, 2000, 10:05:07 AM (26 years ago)

Author:

jeroen

Message:

* empty log message *

Location:

trunk/src/opengl/mesa

Files:

• GL/glu.h (modified) (9 diffs)
• api1.c (modified) (42 diffs)

trunk/src/opengl/mesa/GL/glu.h

@@ -1 @@
-/* $Id: glu.h,v 1.2 2000-02-29 13:56:52 sandervl Exp $ */
+/* $Id: glu.h,v 1.3 2000-03-11 09:05:07 jeroen Exp $ */
 
 /*
@@ -38 +38 @@
 #include "GL/gl.h"
 
-        /* to facilitate clean DLL building ... */
+        /* to facilitate clean DLL building ... */
 #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__))
-#       if defined(_MSC_VER) && defined(BUILD_GLU32) /* tag specify we're building mesa as a DLL */
-#               define GLUAPI __declspec(dllexport)
-#       elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-#               define GLUAPI __declspec(dllimport)
-#       else /* for use with static link lib build of Win32 edition only */
-#               define GLUAPI extern
-#       endif /* _STATIC_MESA support */
+#       if defined(_MSC_VER) && defined(BUILD_GLU32) /* tag specify we're building mesa as a DLL */
+#               define GLUAPI __declspec(dllexport)
+#       elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#               define GLUAPI __declspec(dllimport)
+#       else /* for use with static link lib build of Win32 edition only */
+#               define GLUAPI extern
+#       endif /* _STATIC_MESA support */
 #else
-#       define GLUAPI extern
+#       define GLUAPI extern
 #endif /* WIN32 / CYGWIN32 bracket */
 
 #ifdef macintosh
-        #pragma enumsalwaysint on
-        #if PRAGMA_IMPORT_SUPPORTED
-        #pragma import on
-        #endif
+        #pragma enumsalwaysint on
+        #if PRAGMA_IMPORT_SUPPORTED
+        #pragma import on
+        #endif
 #endif
 
@@ -71 +71 @@
 
 
-#define GLU_VERSION_1_1         1
-#define GLU_VERSION_1_2         1
+#define GLU_VERSION_1_1         1
+#define GLU_VERSION_1_2         1
 
 
@@ -82 +82 @@
 
 enum {
-        /* Normal vectors */
-        GLU_SMOOTH      = 100000,
-        GLU_FLAT        = 100001,
-        GLU_NONE        = 100002,
-
-        /* Quadric draw styles */
-        GLU_POINT       = 100010,
-        GLU_LINE        = 100011,
-        GLU_FILL        = 100012,
-        GLU_SILHOUETTE  = 100013,
-
-        /* Quadric orientation */
-        GLU_OUTSIDE     = 100020,
-        GLU_INSIDE      = 100021,
-
-        /* Tessellator */
-        GLU_TESS_BEGIN          = 100100,
-        GLU_TESS_VERTEX         = 100101,
-        GLU_TESS_END            = 100102,
-        GLU_TESS_ERROR          = 100103,
-        GLU_TESS_EDGE_FLAG      = 100104,
-        GLU_TESS_COMBINE        = 100105,
-
-        GLU_TESS_BEGIN_DATA     = 100106,
-        GLU_TESS_VERTEX_DATA    = 100107,
-        GLU_TESS_END_DATA       = 100108,
-        GLU_TESS_ERROR_DATA     = 100109,
-        GLU_TESS_EDGE_FLAG_DATA = 100110,
-        GLU_TESS_COMBINE_DATA   = 100111,
-
-        /* Winding rules */
-        GLU_TESS_WINDING_ODD            = 100130,
-        GLU_TESS_WINDING_NONZERO        = 100131,
-        GLU_TESS_WINDING_POSITIVE       = 100132,
-        GLU_TESS_WINDING_NEGATIVE       = 100133,
-        GLU_TESS_WINDING_ABS_GEQ_TWO    = 100134,
-
-        /* Tessellation properties */
-        GLU_TESS_WINDING_RULE   = 100140,
-        GLU_TESS_BOUNDARY_ONLY  = 100141,
-        GLU_TESS_TOLERANCE      = 100142,
-
-        /* Tessellation errors */
-        GLU_TESS_ERROR1 = 100151,  /* Missing gluBeginPolygon */
-        GLU_TESS_ERROR2 = 100152,  /* Missing gluBeginContour */
-        GLU_TESS_ERROR3 = 100153,  /* Missing gluEndPolygon */
-        GLU_TESS_ERROR4 = 100154,  /* Missing gluEndContour */
-        GLU_TESS_ERROR5 = 100155,  /* */
-        GLU_TESS_ERROR6 = 100156,  /* */
-        GLU_TESS_ERROR7 = 100157,  /* */
-        GLU_TESS_ERROR8 = 100158,  /* */
+        /* Normal vectors */
+        GLU_SMOOTH      = 100000,
+        GLU_FLAT        = 100001,
+        GLU_NONE        = 100002,
+
+        /* Quadric draw styles */
+        GLU_POINT       = 100010,
+        GLU_LINE        = 100011,
+        GLU_FILL        = 100012,
+        GLU_SILHOUETTE  = 100013,
+
+        /* Quadric orientation */
+        GLU_OUTSIDE     = 100020,
+        GLU_INSIDE      = 100021,
+
+        /* Tessellator */
+        GLU_TESS_BEGIN          = 100100,
+        GLU_TESS_VERTEX         = 100101,
+        GLU_TESS_END            = 100102,
+        GLU_TESS_ERROR          = 100103,
+        GLU_TESS_EDGE_FLAG      = 100104,
+        GLU_TESS_COMBINE        = 100105,
+
+        GLU_TESS_BEGIN_DATA     = 100106,
+        GLU_TESS_VERTEX_DATA    = 100107,
+        GLU_TESS_END_DATA       = 100108,
+        GLU_TESS_ERROR_DATA     = 100109,
+        GLU_TESS_EDGE_FLAG_DATA = 100110,
+        GLU_TESS_COMBINE_DATA   = 100111,
+
+        /* Winding rules */
+        GLU_TESS_WINDING_ODD            = 100130,
+        GLU_TESS_WINDING_NONZERO        = 100131,
+        GLU_TESS_WINDING_POSITIVE       = 100132,
+        GLU_TESS_WINDING_NEGATIVE       = 100133,
+        GLU_TESS_WINDING_ABS_GEQ_TWO    = 100134,
+
+        /* Tessellation properties */
+        GLU_TESS_WINDING_RULE   = 100140,
+        GLU_TESS_BOUNDARY_ONLY  = 100141,
+        GLU_TESS_TOLERANCE      = 100142,
+
+        /* Tessellation errors */
+        GLU_TESS_ERROR1 = 100151,  /* Missing gluBeginPolygon */
+        GLU_TESS_ERROR2 = 100152,  /* Missing gluBeginContour */
+        GLU_TESS_ERROR3 = 100153,  /* Missing gluEndPolygon */
+        GLU_TESS_ERROR4 = 100154,  /* Missing gluEndContour */
+        GLU_TESS_ERROR5 = 100155,  /* */
+        GLU_TESS_ERROR6 = 100156,  /* */
+        GLU_TESS_ERROR7 = 100157,  /* */
+        GLU_TESS_ERROR8 = 100158,  /* */
 
         GLU_TESS_MISSING_BEGIN_POLYGON = GLU_TESS_ERROR1,
@@ -141 +141 @@
         GLU_TESS_NEED_COMBINE_CALLBACK = GLU_TESS_ERROR6,
 
-        /* NURBS */
-        GLU_NURBS_MODE          = 100160,
-        GLU_NURBS_TESSELLATOR   = 100161,
-        GLU_NURBS_RENDERER      = 100162,
-        GLU_NURBS_BEGIN         = 100164,
-        GLU_NURBS_VERTEX        = 100165,
-        GLU_NURBS_NORMAL        = 100166,
-        GLU_NURBS_COLOR         = 100167,
-        GLU_NURBS_TEXTURE_COORD = 100168,
-        GLU_NURBS_END           = 100169,
-        GLU_NURBS_BEGIN_DATA    = 100170,
-        GLU_NURBS_VERTEX_DATA   = 100171,
-        GLU_NURBS_NORMAL_DATA   = 100172,
-        GLU_NURBS_COLOR_DATA    = 100173,
-        GLU_NURBS_TEXTURE_COORD_DATA = 100174,
-        GLU_NURBS_END_DATA      = 100175,
-
-        GLU_AUTO_LOAD_MATRIX    = 100200,
-        GLU_CULLING             = 100201,
-        GLU_PARAMETRIC_TOLERANCE= 100202,
-        GLU_SAMPLING_TOLERANCE  = 100203,
-        GLU_DISPLAY_MODE        = 100204,
-        GLU_SAMPLING_METHOD     = 100205,
-        GLU_U_STEP              = 100206,
-        GLU_V_STEP              = 100207,
-        GLU_OBJECT_PARAMETRIC_ERROR = 100208,
-        GLU_OBJECT_PATH_LENGTH  = 100209,
-
-        GLU_MAP1_TRIM_2         = 100210,
-        GLU_MAP1_TRIM_3         = 100211,
-
-        GLU_PATH_LENGTH         = 100215,
-        GLU_PARAMETRIC_ERROR    = 100216,
-        GLU_DOMAIN_DISTANCE     = 100217,
-
-        GLU_OUTLINE_POLYGON     = 100240,
-        GLU_OUTLINE_PATCH       = 100241,
-
-        GLU_ERROR               = GLU_TESS_ERROR,
+        /* NURBS */
+        GLU_NURBS_MODE          = 100160,
+        GLU_NURBS_TESSELLATOR   = 100161,
+        GLU_NURBS_RENDERER      = 100162,
+        GLU_NURBS_BEGIN         = 100164,
+        GLU_NURBS_VERTEX        = 100165,
+        GLU_NURBS_NORMAL        = 100166,
+        GLU_NURBS_COLOR         = 100167,
+        GLU_NURBS_TEXTURE_COORD = 100168,
+        GLU_NURBS_END           = 100169,
+        GLU_NURBS_BEGIN_DATA    = 100170,
+        GLU_NURBS_VERTEX_DATA   = 100171,
+        GLU_NURBS_NORMAL_DATA   = 100172,
+        GLU_NURBS_COLOR_DATA    = 100173,
+        GLU_NURBS_TEXTURE_COORD_DATA = 100174,
+        GLU_NURBS_END_DATA      = 100175,
+
+        GLU_AUTO_LOAD_MATRIX    = 100200,
+        GLU_CULLING             = 100201,
+        GLU_PARAMETRIC_TOLERANCE= 100202,
+        GLU_SAMPLING_TOLERANCE  = 100203,
+        GLU_DISPLAY_MODE        = 100204,
+        GLU_SAMPLING_METHOD     = 100205,
+        GLU_U_STEP              = 100206,
+        GLU_V_STEP              = 100207,
+        GLU_OBJECT_PARAMETRIC_ERROR = 100208,
+        GLU_OBJECT_PATH_LENGTH  = 100209,
+
+        GLU_MAP1_TRIM_2         = 100210,
+        GLU_MAP1_TRIM_3         = 100211,
+
+        GLU_PATH_LENGTH         = 100215,
+        GLU_PARAMETRIC_ERROR    = 100216,
+        GLU_DOMAIN_DISTANCE     = 100217,
+
+        GLU_OUTLINE_POLYGON     = 100240,
+        GLU_OUTLINE_PATCH       = 100241,
+
+        GLU_ERROR               = GLU_TESS_ERROR,
         GLU_NURBS_ERROR         = GLU_ERROR, /* FIXME: is this correct?? */
 
-        GLU_NURBS_ERROR1  = 100251,   /* spline order un-supported */
-        GLU_NURBS_ERROR2  = 100252,   /* too few knots */
-        GLU_NURBS_ERROR3  = 100253,   /* valid knot range is empty */
-        GLU_NURBS_ERROR4  = 100254,   /* decreasing knot sequence */
-        GLU_NURBS_ERROR5  = 100255,   /* knot multiplicity > spline order */
-        GLU_NURBS_ERROR6  = 100256,   /* endcurve() must follow bgncurve() */
-        GLU_NURBS_ERROR7  = 100257,   /* bgncurve() must precede endcurve() */
-        GLU_NURBS_ERROR8  = 100258,   /* ctrlarray or knot vector is NULL */
-        GLU_NURBS_ERROR9  = 100259,   /* can't draw pwlcurves */
-        GLU_NURBS_ERROR10 = 100260,   /* missing gluNurbsCurve() */
-        GLU_NURBS_ERROR11 = 100261,   /* missing gluNurbsSurface() */
-        GLU_NURBS_ERROR12 = 100262,   /* endtrim() must precede endsurface() */
-        GLU_NURBS_ERROR13 = 100263,   /* bgnsurface() must precede endsurface() */
-        GLU_NURBS_ERROR14 = 100264,   /* curve of improper type passed as trim curve */
-        GLU_NURBS_ERROR15 = 100265,   /* bgnsurface() must precede bgntrim() */
-        GLU_NURBS_ERROR16 = 100266,   /* endtrim() must follow bgntrim() */
-        GLU_NURBS_ERROR17 = 100267,   /* bgntrim() must precede endtrim()*/
-        GLU_NURBS_ERROR18 = 100268,   /* invalid or missing trim curve*/
-        GLU_NURBS_ERROR19 = 100269,   /* bgntrim() must precede pwlcurve() */
-        GLU_NURBS_ERROR20 = 100270,   /* pwlcurve referenced twice*/
-        GLU_NURBS_ERROR21 = 100271,   /* pwlcurve and nurbscurve mixed */
-        GLU_NURBS_ERROR22 = 100272,   /* improper usage of trim data type */
-        GLU_NURBS_ERROR23 = 100273,   /* nurbscurve referenced twice */
-        GLU_NURBS_ERROR24 = 100274,   /* nurbscurve and pwlcurve mixed */
-        GLU_NURBS_ERROR25 = 100275,   /* nurbssurface referenced twice */
-        GLU_NURBS_ERROR26 = 100276,   /* invalid property */
-        GLU_NURBS_ERROR27 = 100277,   /* endsurface() must follow bgnsurface() */
-        GLU_NURBS_ERROR28 = 100278,   /* intersecting or misoriented trim curves */
-        GLU_NURBS_ERROR29 = 100279,   /* intersecting trim curves */
-        GLU_NURBS_ERROR30 = 100280,   /* UNUSED */
-        GLU_NURBS_ERROR31 = 100281,   /* unconnected trim curves */
-        GLU_NURBS_ERROR32 = 100282,   /* unknown knot error */
-        GLU_NURBS_ERROR33 = 100283,   /* negative vertex count encountered */
-        GLU_NURBS_ERROR34 = 100284,   /* negative byte-stride */
-        GLU_NURBS_ERROR35 = 100285,   /* unknown type descriptor */
-        GLU_NURBS_ERROR36 = 100286,   /* null control point reference */
-        GLU_NURBS_ERROR37 = 100287,   /* duplicate point on pwlcurve */
-
-        /* Errors */
-        GLU_INVALID_ENUM                = 100900,
-        GLU_INVALID_VALUE               = 100901,
-        GLU_OUT_OF_MEMORY               = 100902,
-        GLU_INCOMPATIBLE_GL_VERSION     = 100903,
+        GLU_NURBS_ERROR1  = 100251,   /* spline order un-supported */
+        GLU_NURBS_ERROR2  = 100252,   /* too few knots */
+        GLU_NURBS_ERROR3  = 100253,   /* valid knot range is empty */
+        GLU_NURBS_ERROR4  = 100254,   /* decreasing knot sequence */
+        GLU_NURBS_ERROR5  = 100255,   /* knot multiplicity > spline order */
+        GLU_NURBS_ERROR6  = 100256,   /* endcurve() must follow bgncurve() */
+        GLU_NURBS_ERROR7  = 100257,   /* bgncurve() must precede endcurve() */
+        GLU_NURBS_ERROR8  = 100258,   /* ctrlarray or knot vector is NULL */
+        GLU_NURBS_ERROR9  = 100259,   /* can't draw pwlcurves */
+        GLU_NURBS_ERROR10 = 100260,   /* missing gluNurbsCurve() */
+        GLU_NURBS_ERROR11 = 100261,   /* missing gluNurbsSurface() */
+        GLU_NURBS_ERROR12 = 100262,   /* endtrim() must precede endsurface() */
+        GLU_NURBS_ERROR13 = 100263,   /* bgnsurface() must precede endsurface() */
+        GLU_NURBS_ERROR14 = 100264,   /* curve of improper type passed as trim curve */
+        GLU_NURBS_ERROR15 = 100265,   /* bgnsurface() must precede bgntrim() */
+        GLU_NURBS_ERROR16 = 100266,   /* endtrim() must follow bgntrim() */
+        GLU_NURBS_ERROR17 = 100267,   /* bgntrim() must precede endtrim()*/
+        GLU_NURBS_ERROR18 = 100268,   /* invalid or missing trim curve*/
+        GLU_NURBS_ERROR19 = 100269,   /* bgntrim() must precede pwlcurve() */
+        GLU_NURBS_ERROR20 = 100270,   /* pwlcurve referenced twice*/
+        GLU_NURBS_ERROR21 = 100271,   /* pwlcurve and nurbscurve mixed */
+        GLU_NURBS_ERROR22 = 100272,   /* improper usage of trim data type */
+        GLU_NURBS_ERROR23 = 100273,   /* nurbscurve referenced twice */
+        GLU_NURBS_ERROR24 = 100274,   /* nurbscurve and pwlcurve mixed */
+        GLU_NURBS_ERROR25 = 100275,   /* nurbssurface referenced twice */
+        GLU_NURBS_ERROR26 = 100276,   /* invalid property */
+        GLU_NURBS_ERROR27 = 100277,   /* endsurface() must follow bgnsurface() */
+        GLU_NURBS_ERROR28 = 100278,   /* intersecting or misoriented trim curves */
+        GLU_NURBS_ERROR29 = 100279,   /* intersecting trim curves */
+        GLU_NURBS_ERROR30 = 100280,   /* UNUSED */
+        GLU_NURBS_ERROR31 = 100281,   /* unconnected trim curves */
+        GLU_NURBS_ERROR32 = 100282,   /* unknown knot error */
+        GLU_NURBS_ERROR33 = 100283,   /* negative vertex count encountered */
+        GLU_NURBS_ERROR34 = 100284,   /* negative byte-stride */
+        GLU_NURBS_ERROR35 = 100285,   /* unknown type descriptor */
+        GLU_NURBS_ERROR36 = 100286,   /* null control point reference */
+        GLU_NURBS_ERROR37 = 100287,   /* duplicate point on pwlcurve */
+
+        /* Errors */
+        GLU_INVALID_ENUM                = 100900,
+        GLU_INVALID_VALUE               = 100901,
+        GLU_OUT_OF_MEMORY               = 100902,
+        GLU_INCOMPATIBLE_GL_VERSION     = 100903,
         GLU_INVALID_OPERATION           = 100904,
 
-        /* New in GLU 1.1 */
-        GLU_VERSION     = 100800,
-        GLU_EXTENSIONS  = 100801,
-
-        /*** GLU 1.0 tessellation - obsolete! ***/
-
-        /* Contour types */
-        GLU_CW          = 100120,
-        GLU_CCW         = 100121,
-        GLU_INTERIOR    = 100122,
-        GLU_EXTERIOR    = 100123,
-        GLU_UNKNOWN     = 100124,
-
-        /* Tessellator */
-        GLU_BEGIN       = GLU_TESS_BEGIN,
-        GLU_VERTEX      = GLU_TESS_VERTEX,
-        GLU_END         = GLU_TESS_END,
-        GLU_EDGE_FLAG   = GLU_TESS_EDGE_FLAG
+        /* New in GLU 1.1 */
+        GLU_VERSION     = 100800,
+        GLU_EXTENSIONS  = 100801,
+
+        /*** GLU 1.0 tessellation - obsolete! ***/
+
+        /* Contour types */
+        GLU_CW          = 100120,
+        GLU_CCW         = 100121,
+        GLU_INTERIOR    = 100122,
+        GLU_EXTERIOR    = 100123,
+        GLU_UNKNOWN     = 100124,
+
+        /* Tessellator */
+        GLU_BEGIN       = GLU_TESS_BEGIN,
+        GLU_VERTEX      = GLU_TESS_VERTEX,
+        GLU_END         = GLU_TESS_END,
+        GLU_EDGE_FLAG   = GLU_TESS_EDGE_FLAG
 };
 
@@ -360 +360 @@
 
 GLUAPI void GLAPIENTRY gluQuadricCallback( GLUquadricObj *qobj,
-                                         GLenum which, void (GLCALLBACK *fn)() );
+                                           GLenum which,
+                                           void (GLCALLBACK *fn)() );
 
 GLUAPI void GLAPIENTRY gluCylinder( GLUquadricObj *qobj,
@@ -449 +450 @@
 
 GLUAPI void GLAPIENTRY gluTessBeginPolygon( GLUtesselator *tobj,
-                                            void *polygon_data );
+                                            void *polygon_data );
 
 GLUAPI void GLAPIENTRY gluTessBeginContour( GLUtesselator *tobj );
 
 GLUAPI void GLAPIENTRY gluTessVertex( GLUtesselator *tobj, GLdouble coords[3],
-                                      void *vertex_data );
+                                      void *vertex_data );
 
 GLUAPI void GLAPIENTRY gluTessEndContour( GLUtesselator *tobj );
@@ -461 +462 @@
 
 GLUAPI void GLAPIENTRY gluTessProperty( GLUtesselator *tobj, GLenum which,
-                                        GLdouble value );
+                                        GLdouble value );
 
 GLUAPI void GLAPIENTRY gluTessNormal( GLUtesselator *tobj, GLdouble x,
-                                      GLdouble y, GLdouble z );
+                                      GLdouble y, GLdouble z );
 
 GLUAPI void GLAPIENTRY gluTessCallback( GLUtesselator *tobj, GLenum which,
-                                        void (GLCALLBACK *fn)() );
+                                        void (GLCALLBACK *fn)() );
 
 GLUAPI void GLAPIENTRY gluGetTessProperty( GLUtesselator *tobj, GLenum which,
-                                           GLdouble *value );
+                                           GLdouble *value );
 
 /*
@@ -502 +503 @@
 
 #ifdef macintosh
-        #pragma enumsalwaysint reset
-        #if PRAGMA_IMPORT_SUPPORTED
-        #pragma import off
-        #endif
+        #pragma enumsalwaysint reset
+        #if PRAGMA_IMPORT_SUPPORTED
+        #pragma import off
+        #endif
 #endif
 

trunk/src/opengl/mesa/api1.c

@@ -1 @@
-/* $Id: api1.c,v 1.1 2000-02-29 00:49:57 sandervl Exp $ */
+/* $Id: api1.c,v 1.2 2000-03-11 09:05:06 jeroen Exp $ */
 
 /*
@@ -54 +54 @@
 #endif
 
+#include <misc.h>
+
 /*
  * Part 1 of API functions
@@ -85 +87 @@
  * function pointer.
  */
-#define ARRAY_ELT( IM, i )                                      \
-{                                                               \
-   GLuint count = IM->Count;                                    \
-   IM->Elt[count] = i;                                          \
-   IM->Flag[count] = ((IM->Flag[count] & IM->ArrayAndFlags) |   \
-                      VERT_ELT);                                \
-   IM->FlushElt |= IM->ArrayEltFlush;                           \
-   IM->Count = count += IM->ArrayIncr;                          \
-   if (count == VB_MAX)                                         \
-      IM->maybe_transform_vb( IM );                             \
+#define ARRAY_ELT( IM, i )                                      \
+{                                                               \
+   GLuint count = IM->Count;                                    \
+   IM->Elt[count] = i;                                          \
+   IM->Flag[count] = ((IM->Flag[count] & IM->ArrayAndFlags) |   \
+                      VERT_ELT);                                \
+   IM->FlushElt |= IM->ArrayEltFlush;                           \
+   IM->Count = count += IM->ArrayIncr;                          \
+   if (count == VB_MAX)                                         \
+      IM->maybe_transform_vb( IM );                             \
 }
 
@@ -125 +127 @@
    if (mode < GL_POINTS || mode > GL_POLYGON) {
       gl_compile_error( CC, GL_INVALID_ENUM, "glBegin" );
-      return;           
+      return;
    }
 
@@ -251 +253 @@
  * color-material and vertex arrays.
  */
-#define COLOR( IM, r,g,b,a )                    \
-{                                               \
-   GLuint count = IM->Count;                    \
-   IM->Flag[count] |= VERT_RGBA;                \
-   IM->Color[count][0] = r;                     \
-   IM->Color[count][1] = g;                     \
-   IM->Color[count][2] = b;                     \
-   IM->Color[count][3] = a;                     \
+#define COLOR( IM, r,g,b,a )                    \
+{                                               \
+   GLuint count = IM->Count;                    \
+   IM->Flag[count] |= VERT_RGBA;                \
+   IM->Color[count][0] = r;                     \
+   IM->Color[count][1] = g;                     \
+   IM->Color[count][2] = b;                     \
+   IM->Color[count][3] = a;                     \
 }
 
 #if 0
-#define COLOR4F( IM, r,g,b,a )                          \
-{                                                       \
-   GLuint count = IM->Count;                            \
-   IM->Flag[count] |= VERT_RGBA | VERT_FLOAT_RGBA;      \
-   IM->FloatColor[count][0] = r;                        \
-   IM->FloatColor[count][1] = g;                        \
-   IM->FloatColor[count][2] = b;                        \
-   IM->FloatColor[count][3] = a;                        \
+#define COLOR4F( IM, r,g,b,a )                          \
+{                                                       \
+   GLuint count = IM->Count;                            \
+   IM->Flag[count] |= VERT_RGBA | VERT_FLOAT_RGBA;      \
+   IM->FloatColor[count][0] = r;                        \
+   IM->FloatColor[count][1] = g;                        \
+   IM->FloatColor[count][2] = b;                        \
+   IM->FloatColor[count][3] = a;                        \
 }
 #else
-#define COLOR4F(IM, r, g, b, a)                 \
-{                                               \
-   GLubyte col[4];                              \
-   FLOAT_COLOR_TO_UBYTE_COLOR(col[0], r);       \
-   FLOAT_COLOR_TO_UBYTE_COLOR(col[1], g);       \
-   FLOAT_COLOR_TO_UBYTE_COLOR(col[2], b);       \
-   FLOAT_COLOR_TO_UBYTE_COLOR(col[3], a);       \
-   COLORV( IM, col );                           \
+#define COLOR4F(IM, r, g, b, a)                 \
+{                                               \
+   GLubyte col[4];                              \
+   FLOAT_COLOR_TO_UBYTE_COLOR(col[0], r);       \
+   FLOAT_COLOR_TO_UBYTE_COLOR(col[1], g);       \
+   FLOAT_COLOR_TO_UBYTE_COLOR(col[2], b);       \
+   FLOAT_COLOR_TO_UBYTE_COLOR(col[3], a);       \
+   COLORV( IM, col );                           \
 }
 #endif
@@ -285 +287 @@
 
 
-#define COLORV( IM, v )                         \
-{                                               \
-   GLuint count = IM->Count;                    \
-   IM->Flag[count] |= VERT_RGBA;                \
-   COPY_4UBV(IM->Color[count], v);              \
+#define COLORV( IM, v )                         \
+{                                               \
+   GLuint count = IM->Count;                    \
+   IM->Flag[count] |= VERT_RGBA;                \
+   COPY_4UBV(IM->Color[count], v);              \
 }
 
@@ -297 +299 @@
    GET_IMMEDIATE;
    COLOR( IM,
-          BYTE_TO_UBYTE(red),
-          BYTE_TO_UBYTE(green),
-          BYTE_TO_UBYTE(blue),
-          255 );
+          BYTE_TO_UBYTE(red),
+          BYTE_TO_UBYTE(green),
+          BYTE_TO_UBYTE(blue),
+          255 );
 }
 
@@ -339 +341 @@
    GET_IMMEDIATE;
    COLOR( IM, INT_TO_UBYTE(red),
-          INT_TO_UBYTE(green),
-          INT_TO_UBYTE(blue),
-          255);
+          INT_TO_UBYTE(green),
+          INT_TO_UBYTE(blue),
+          255);
 }
 
@@ -349 +351 @@
    GET_IMMEDIATE;
    COLOR( IM, SHORT_TO_UBYTE(red),
-          SHORT_TO_UBYTE(green),
-          SHORT_TO_UBYTE(blue),
-          255);
+          SHORT_TO_UBYTE(green),
+          SHORT_TO_UBYTE(blue),
+          255);
 }
 
@@ -366 +368 @@
    GET_IMMEDIATE;
    COLOR( IM, UINT_TO_UBYTE(red),
-          UINT_TO_UBYTE(green),
-          UINT_TO_UBYTE(blue),
-          255 );
+          UINT_TO_UBYTE(green),
+          UINT_TO_UBYTE(blue),
+          255 );
 }
 
@@ -376 +378 @@
    GET_IMMEDIATE;
    COLOR( IM, USHORT_TO_UBYTE(red), USHORT_TO_UBYTE(green),
-          USHORT_TO_UBYTE(blue),
-          255 );
+          USHORT_TO_UBYTE(blue),
+          255 );
 }
 
@@ -385 +387 @@
    GET_IMMEDIATE;
    COLOR( IM, BYTE_TO_UBYTE(red), BYTE_TO_UBYTE(green),
-          BYTE_TO_UBYTE(blue), BYTE_TO_UBYTE(alpha) );
+          BYTE_TO_UBYTE(blue), BYTE_TO_UBYTE(alpha) );
 }
 
 
 void GLAPIENTRY glColor4d(CTX_ARG GLdouble red, GLdouble green, GLdouble blue,
-                           GLdouble alpha )
+                           GLdouble alpha )
 {
    GLubyte col[4];
@@ -426 +428 @@
    GET_IMMEDIATE;
    COLOR( IM, INT_TO_UBYTE(red), INT_TO_UBYTE(green),
-          INT_TO_UBYTE(blue), INT_TO_UBYTE(alpha) );
+          INT_TO_UBYTE(blue), INT_TO_UBYTE(alpha) );
 }
 
@@ -435 +437 @@
    GET_IMMEDIATE;
    COLOR( IM, SHORT_TO_UBYTE(red), SHORT_TO_UBYTE(green),
-          SHORT_TO_UBYTE(blue), SHORT_TO_UBYTE(alpha) );
+          SHORT_TO_UBYTE(blue), SHORT_TO_UBYTE(alpha) );
 }
 
@@ -450 +452 @@
    GET_IMMEDIATE;
    COLOR( IM, UINT_TO_UBYTE(red), UINT_TO_UBYTE(green),
-          UINT_TO_UBYTE(blue), UINT_TO_UBYTE(alpha) );
+          UINT_TO_UBYTE(blue), UINT_TO_UBYTE(alpha) );
 }
 
@@ -458 +460 @@
    GET_IMMEDIATE;
    COLOR( IM, USHORT_TO_UBYTE(red), USHORT_TO_UBYTE(green),
-          USHORT_TO_UBYTE(blue), USHORT_TO_UBYTE(alpha) );
+          USHORT_TO_UBYTE(blue), USHORT_TO_UBYTE(alpha) );
 }
 
@@ -466 +468 @@
    GET_IMMEDIATE;
    COLOR( IM, BYTE_TO_UBYTE(v[0]), BYTE_TO_UBYTE(v[1]),
-          BYTE_TO_UBYTE(v[2]), 255 );
+          BYTE_TO_UBYTE(v[2]), 255 );
 }
 
@@ -505 +507 @@
    GET_IMMEDIATE;
    COLOR( IM, INT_TO_UBYTE(v[0]), INT_TO_UBYTE(v[1]),
-          INT_TO_UBYTE(v[2]), 255 );
+          INT_TO_UBYTE(v[2]), 255 );
 }
 
@@ -513 +515 @@
    GET_IMMEDIATE;
    COLOR( IM, SHORT_TO_UBYTE(v[0]), SHORT_TO_UBYTE(v[1]),
-          SHORT_TO_UBYTE(v[2]), 255 );
+          SHORT_TO_UBYTE(v[2]), 255 );
 }
 
@@ -528 +530 @@
    GET_IMMEDIATE;
    COLOR( IM, UINT_TO_UBYTE(v[0]), UINT_TO_UBYTE(v[1]),
-          UINT_TO_UBYTE(v[2]), 255 );
+          UINT_TO_UBYTE(v[2]), 255 );
 }
 
@@ -536 +538 @@
    GET_IMMEDIATE;
    COLOR( IM, USHORT_TO_UBYTE(v[0]), USHORT_TO_UBYTE(v[1]),
-          USHORT_TO_UBYTE(v[2]), 255 );
+          USHORT_TO_UBYTE(v[2]), 255 );
 
 }
@@ -545 +547 @@
    GET_IMMEDIATE;
    COLOR( IM, BYTE_TO_UBYTE(v[0]), BYTE_TO_UBYTE(v[1]),
-          BYTE_TO_UBYTE(v[2]), BYTE_TO_UBYTE(v[3]) );
+          BYTE_TO_UBYTE(v[2]), BYTE_TO_UBYTE(v[3]) );
 }
 
@@ -585 +587 @@
    GET_IMMEDIATE;
    COLOR( IM, INT_TO_UBYTE(v[0]), INT_TO_UBYTE(v[1]),
-          INT_TO_UBYTE(v[2]), INT_TO_UBYTE(v[3]) );
+          INT_TO_UBYTE(v[2]), INT_TO_UBYTE(v[3]) );
 }
 
@@ -593 +595 @@
    GET_IMMEDIATE;
    COLOR( IM, SHORT_TO_UBYTE(v[0]), SHORT_TO_UBYTE(v[1]),
-          SHORT_TO_UBYTE(v[2]), SHORT_TO_UBYTE(v[3]) );
+          SHORT_TO_UBYTE(v[2]), SHORT_TO_UBYTE(v[3]) );
 }
 
@@ -608 +610 @@
    GET_IMMEDIATE;
    COLOR( IM, UINT_TO_UBYTE(v[0]), UINT_TO_UBYTE(v[1]),
-          UINT_TO_UBYTE(v[2]), UINT_TO_UBYTE(v[3]) );
+          UINT_TO_UBYTE(v[2]), UINT_TO_UBYTE(v[3]) );
 }
 
@@ -616 +618 @@
    GET_IMMEDIATE;
    COLOR( IM, USHORT_TO_UBYTE(v[0]), USHORT_TO_UBYTE(v[1]),
-          USHORT_TO_UBYTE(v[2]), USHORT_TO_UBYTE(v[3]) );
+          USHORT_TO_UBYTE(v[2]), USHORT_TO_UBYTE(v[3]) );
 }
 
@@ -833 +835 @@
    state = IM->BeginState;
    inflags = (~state) & (VERT_BEGIN_0|VERT_BEGIN_1);
-   state |= inflags << 2;       /* errors */
+   state |= inflags << 2;       /* errors */
 
    if (MESA_VERBOSE&VERBOSE_API) {
       if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
-         fprintf(stderr, "glEnd(IM %d), BeginState is %x, errors %x\n",
-                 IM->id, state,
-                 inflags<<2);
+         fprintf(stderr, "glEnd(IM %d), BeginState is %x, errors %x\n",
+                 IM->id, state,
+                 inflags<<2);
       else
-         fprintf(stderr, ">");
+         fprintf(stderr, ">");
    }
 
@@ -857 +859 @@
 
       if (IM->FlushElt) {
-         gl_exec_array_elements( IM->backref, IM, last, count );
-         IM->FlushElt = 0;
+         gl_exec_array_elements( IM->backref, IM, last, count );
+         IM->FlushElt = 0;
       }
    }
@@ -881 +883 @@
    if (MESA_VERBOSE&VERBOSE_API) {
       if (MESA_VERBOSE&VERBOSE_IMMEDIATE)
-         fprintf(stderr, "gl_End(IM %d), BeginState is %x, errors %x\n",
-                 IM->id, state,
-                 inflags<<2);
+         fprintf(stderr, "gl_End(IM %d), BeginState is %x, errors %x\n",
+                 IM->id, state,
+                 inflags<<2);
       else
-         fprintf(stderr, ">");
+         fprintf(stderr, ">");
    }
 
-   state |= inflags << 2;       /* errors */
+   state |= inflags << 2;       /* errors */
 
    if (inflags != (VERT_BEGIN_0|VERT_BEGIN_1))
@@ -902 +904 @@
 
       if (IM->FlushElt) {
-         gl_exec_array_elements( ctx, IM, last, count );
-         IM->FlushElt = 0;
+         gl_exec_array_elements( ctx, IM, last, count );
+         IM->FlushElt = 0;
       }
    }
@@ -950 +952 @@
 
 
-#define EVALCOORD1(IM, x)                               \
-{                                                       \
-   GLuint count = IM->Count++;                          \
-   IM->Flag[count] |= VERT_EVAL_C1;                     \
-   ASSIGN_4V(IM->Obj[count], x, 0, 0, 1);               \
-   if (count == VB_MAX-1)                               \
-      IM->maybe_transform_vb( IM );                     \
-}
-
-#define EVALCOORD2(IM, x, y)                            \
-{                                                       \
-   GLuint count = IM->Count++;                          \
-   IM->Flag[count] |= VERT_EVAL_C2;                     \
-   ASSIGN_4V(IM->Obj[count], x, y, 0, 1);               \
-   if (count == VB_MAX-1)                               \
-      IM->maybe_transform_vb( IM );                     \
-}
-
-#define EVALPOINT1(IM, x)                               \
-{                                                       \
-   GLuint count = IM->Count++;                          \
-   IM->Flag[count] |= VERT_EVAL_P1;                     \
-   ASSIGN_4V(IM->Obj[count], x, 0, 0, 1);               \
-   if (count == VB_MAX-1)                               \
-      IM->maybe_transform_vb( IM );                     \
-}
-
-#define EVALPOINT2(IM, x, y)                            \
-{                                                       \
-   GLuint count = IM->Count++;                          \
-   IM->Flag[count] |= VERT_EVAL_P2;                     \
-   ASSIGN_4V(IM->Obj[count], x, y, 0, 1);               \
-   if (count == VB_MAX-1)                               \
-      IM->maybe_transform_vb( IM );                     \
+#define EVALCOORD1(IM, x)                               \
+{                                                       \
+   GLuint count = IM->Count++;                          \
+   IM->Flag[count] |= VERT_EVAL_C1;                     \
+   ASSIGN_4V(IM->Obj[count], x, 0, 0, 1);               \
+   if (count == VB_MAX-1)                               \
+      IM->maybe_transform_vb( IM );                     \
+}
+
+#define EVALCOORD2(IM, x, y)                            \
+{                                                       \
+   GLuint count = IM->Count++;                          \
+   IM->Flag[count] |= VERT_EVAL_C2;                     \
+   ASSIGN_4V(IM->Obj[count], x, y, 0, 1);               \
+   WriteLog("OPENGL32: EVALCOORD2 (%f,%f) IM: %08X - cnt %d\n",x,y,IM,count); \
+   if (count == VB_MAX-1)                               \
+   {WriteLog("OPENGL32: EVALCOORD2 is calling maybe_transform\n"); \
+      IM->maybe_transform_vb( IM );                     }\
+}
+
+#define EVALPOINT1(IM, x)                               \
+{                                                       \
+   GLuint count = IM->Count++;                          \
+   IM->Flag[count] |= VERT_EVAL_P1;                     \
+   ASSIGN_4V(IM->Obj[count], x, 0, 0, 1);               \
+   if (count == VB_MAX-1)                               \
+      IM->maybe_transform_vb( IM );                     \
+}
+
+#define EVALPOINT2(IM, x, y)                            \
+{                                                       \
+   GLuint count = IM->Count++;                          \
+   IM->Flag[count] |= VERT_EVAL_P2;                     \
+   ASSIGN_4V(IM->Obj[count], x, y, 0, 1);               \
+   if (count == VB_MAX-1)                               \
+      IM->maybe_transform_vb( IM );                     \
 }
 
@@ -1173 +1177 @@
       case GL_FOG_END:
       case GL_FOG_INDEX:
-         p[0] = (GLfloat) *params;
-         break;
+         p[0] = (GLfloat) *params;
+         break;
       case GL_FOG_COLOR:
-         p[0] = INT_TO_FLOAT( params[0] );
-         p[1] = INT_TO_FLOAT( params[1] );
-         p[2] = INT_TO_FLOAT( params[2] );
-         p[3] = INT_TO_FLOAT( params[3] );
-         break;
+         p[0] = INT_TO_FLOAT( params[0] );
+         p[1] = INT_TO_FLOAT( params[1] );
+         p[2] = INT_TO_FLOAT( params[2] );
+         p[3] = INT_TO_FLOAT( params[3] );
+         break;
       default:
          /* Error will be caught later in gl_Fogfv */
@@ -1477 +1481 @@
 
 
-#define INDEX( c )                              \
-{                                               \
-   GLuint count;                                \
-   GET_IMMEDIATE;                               \
-   count = IM->Count;                           \
-   IM->Index[count] = c;                        \
-   IM->Flag[count] |= VERT_INDEX;               \
+#define INDEX( c )                              \
+{                                               \
+   GLuint count;                                \
+   GET_IMMEDIATE;                               \
+   count = IM->Count;                           \
+   IM->Index[count] = c;                        \
+   IM->Flag[count] |= VERT_INDEX;               \
 }
 
@@ -1740 +1744 @@
 
    for (i=0;i<16;i++) {
-          fm[i] = (GLfloat) m[i];
+          fm[i] = (GLfloat) m[i];
    }
 
@@ -1946 +1950 @@
 
    for (i=0;i<16;i++) {
-          fm[i] = (GLfloat) m[i];
+          fm[i] = (GLfloat) m[i];
    }
 
@@ -1974 +1978 @@
  *     (ie shared) normals.
  */
-#define NORMAL( x,y,z )                         \
-{                                               \
-   GLuint count;                                \
-   GLfloat *normal;                             \
-   GET_IMMEDIATE;                               \
-   count = IM->Count;                           \
-   IM->Flag[count] |= VERT_NORM;                \
-   normal = IM->Normal[count];                  \
-   ASSIGN_3V(normal, x,y,z);                    \
+#define NORMAL( x,y,z )                         \
+{                                               \
+   GLuint count;                                \
+   GLfloat *normal;                             \
+   GET_IMMEDIATE;                               \
+   count = IM->Count;                           \
+   IM->Flag[count] |= VERT_NORM;                \
+   normal = IM->Normal[count];                  \
+   ASSIGN_3V(normal, x,y,z);                    \
 }
 
@@ -1989 +1993 @@
 {
    NORMAL( BYTE_TO_FLOAT(nx),
-           BYTE_TO_FLOAT(ny),
-           BYTE_TO_FLOAT(nz) );
+           BYTE_TO_FLOAT(ny),
+           BYTE_TO_FLOAT(nz) );
 }
 
@@ -2009 +2013 @@
 {
    NORMAL( INT_TO_FLOAT(nx),
-           INT_TO_FLOAT(ny),
-           INT_TO_FLOAT(nz) );
+           INT_TO_FLOAT(ny),
+           INT_TO_FLOAT(nz) );
 }
 
@@ -2017 +2021 @@
 {
    NORMAL( SHORT_TO_FLOAT(nx),
-           SHORT_TO_FLOAT(ny),
-           SHORT_TO_FLOAT(nz) );
+           SHORT_TO_FLOAT(ny),
+           SHORT_TO_FLOAT(nz) );
 }
 
@@ -2025 +2029 @@
 {
    NORMAL( BYTE_TO_FLOAT(v[0]),
-           BYTE_TO_FLOAT(v[1]),
-           BYTE_TO_FLOAT(v[2]) );
+           BYTE_TO_FLOAT(v[1]),
+           BYTE_TO_FLOAT(v[2]) );
 }
 
@@ -2045 +2049 @@
 {
    NORMAL( INT_TO_FLOAT(v[0]),
-           INT_TO_FLOAT(v[1]),
-           INT_TO_FLOAT(v[2]) );
+           INT_TO_FLOAT(v[1]),
+           INT_TO_FLOAT(v[2]) );
 }
 
@@ -2053 +2057 @@
 {
    NORMAL( SHORT_TO_FLOAT(v[0]),
-           SHORT_TO_FLOAT(v[1]),
-           SHORT_TO_FLOAT(v[2]) );
-}
-
+           SHORT_TO_FLOAT(v[1]),
+           SHORT_TO_FLOAT(v[2]) );
+}
+