Changeset 2945 for trunk/src/opengl/mesa/GL

Timestamp:

Feb 29, 2000, 2:56:52 PM (25 years ago)

Author:

sandervl

Message:

compile fixes

Location:

trunk/src/opengl/mesa/GL

Files:

• gl.h (modified) (2 diffs)
• glu.h (modified) (8 diffs)

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

@@ -1 @@
-/* $Id: gl.h,v 1.1 2000-02-29 00:43:31 sandervl Exp $ */
+/* $Id: gl.h,v 1.2 2000-02-29 13:56:52 sandervl Exp $ */
 
 /*
@@ -1043 +1043 @@
 
 }
-#ifdef CENTERLINE_CLPP
+#if defined(CENTERLINE_CLPP) || defined(__cplusplus)
   /* CenterLine C++ workaround: */
   gl_enum;

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

@@ -1 @@
-/* $Id: glu.h,v 1.1 2000-02-29 00:43:31 sandervl Exp $ */
+/* $Id: glu.h,v 1.2 2000-02-29 13:56:52 sandervl Exp $ */
 
 /*
@@ -78 +78 @@
 #define GLU_FALSE  GL_FALSE
 
+#define GLU_TESS_MAX_COORD      1.0e150
+
 
 enum {
@@ -132 +134 @@
         GLU_TESS_ERROR8 = 100158,  /* */
 
+        GLU_TESS_MISSING_BEGIN_POLYGON = GLU_TESS_ERROR1,
+        GLU_TESS_MISSING_BEGIN_CONTOUR = GLU_TESS_ERROR2,
+        GLU_TESS_MISSING_END_POLYGON   = GLU_TESS_ERROR3,
+        GLU_TESS_MISSING_END_CONTOUR   = GLU_TESS_ERROR4,
+        GLU_TESS_COORD_TOO_LARGE       = GLU_TESS_ERROR5,
+        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,
@@ -141 +166 @@
         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,
@@ -146 +176 @@
         GLU_DOMAIN_DISTANCE     = 100217,
 
-        GLU_MAP1_TRIM_2         = 100210,
-        GLU_MAP1_TRIM_3         = 100211,
-
         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 */
@@ -195 +225 @@
         GLU_OUT_OF_MEMORY               = 100902,
         GLU_INCOMPATIBLE_GL_VERSION     = 100903,
+        GLU_INVALID_OPERATION           = 100904,
 
         /* New in GLU 1.1 */
@@ -213 +244 @@
         GLU_VERTEX      = GLU_TESS_VERTEX,
         GLU_END         = GLU_TESS_END,
-        GLU_ERROR       = GLU_TESS_ERROR,
         GLU_EDGE_FLAG   = GLU_TESS_EDGE_FLAG
 };
@@ -404 +434 @@
                                        void (GLCALLBACK *fn)() );
 
+GLUAPI GLboolean GLAPIENTRY gluCheckExtension(const GLubyte *extName,
+                                              const GLubyte *extString);