added missing POINT/LINE RANGE/GRANULARITY tokens

diff --git a/include/GL/gl.h b/include/GL/gl.h
index b485b3bd5a8c4526526fd4bbb4c501a9e14e87ff..beea5a8157df93a48bf7be3fa61d69af161a0ae9 100644 (file)
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.27 2000/01/08 10:51:20 brianp Exp $ */
+/* $Id: gl.h,v 1.28 2000/01/17 18:05:24 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -794,6 +794,14 @@ typedef double             GLclampd;       /* double precision float in [0,1] */
 #define GL_TEXTURE_MAX_LOD                     0x813B
 #define GL_TEXTURE_BASE_LEVEL                  0x813C
 #define GL_TEXTURE_MAX_LEVEL                   0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE             0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY       0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE             0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY       0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE            0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE            0x846E
+
+
 
 /*
  * OpenGL 1.2 imaging subset (NOT IMPLEMENTED BY MESA)

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 684537adf5376a72ec3d9d375dd8c773f3c5a2c1..ed7740becdad751ad2fa175c8f7383434a4611de 100644 (file)
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,10 +1,10 @@
-/* $Id: get.c,v 1.7 1999/12/10 20:01:06 brianp Exp $ */
+/* $Id: get.c,v 1.8 2000/01/17 18:05:46 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -388,6 +388,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
         *params = FLOAT_TO_BOOL(LINE_WIDTH_GRANULARITY);
         break;
       case GL_LINE_WIDTH_RANGE:
+      case GL_ALIASED_LINE_WIDTH_RANGE:
         params[0] = FLOAT_TO_BOOL(MIN_LINE_WIDTH);
         params[1] = FLOAT_TO_BOOL(MAX_LINE_WIDTH);
         break;
@@ -615,6 +616,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
         *params = FLOAT_TO_BOOL(POINT_SIZE_GRANULARITY );
         break;
       case GL_POINT_SIZE_RANGE:
+      case GL_ALIASED_POINT_SIZE_RANGE:
         params[0] = FLOAT_TO_BOOL(MIN_POINT_SIZE );
         params[1] = FLOAT_TO_BOOL(MAX_POINT_SIZE );
         break;
@@ -1338,6 +1340,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
         *params = (GLdouble) LINE_WIDTH_GRANULARITY;
         break;
       case GL_LINE_WIDTH_RANGE:
+      case GL_ALIASED_LINE_WIDTH_RANGE:
         params[0] = (GLdouble) MIN_LINE_WIDTH;
         params[1] = (GLdouble) MAX_LINE_WIDTH;
         break;
@@ -1565,6 +1568,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params )
         *params = (GLdouble) POINT_SIZE_GRANULARITY;
         break;
       case GL_POINT_SIZE_RANGE:
+      case GL_ALIASED_POINT_SIZE_RANGE:
         params[0] = (GLdouble) MIN_POINT_SIZE;
         params[1] = (GLdouble) MAX_POINT_SIZE;
         break;
@@ -2285,6 +2289,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
         *params = (GLfloat) LINE_WIDTH_GRANULARITY;
         break;
       case GL_LINE_WIDTH_RANGE:
+      case GL_ALIASED_LINE_WIDTH_RANGE:
         params[0] = (GLfloat) MIN_LINE_WIDTH;
         params[1] = (GLfloat) MAX_LINE_WIDTH;
         break;
@@ -2512,6 +2517,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
         *params = (GLfloat) POINT_SIZE_GRANULARITY;
         break;
       case GL_POINT_SIZE_RANGE:
+      case GL_ALIASED_POINT_SIZE_RANGE:
         params[0] = (GLfloat) MIN_POINT_SIZE;
         params[1] = (GLfloat) MAX_POINT_SIZE;
         break;
@@ -3214,6 +3220,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
         *params = (GLint) LINE_WIDTH_GRANULARITY;
         break;
       case GL_LINE_WIDTH_RANGE:
+      case GL_ALIASED_LINE_WIDTH_RANGE:
         params[0] = (GLint) MIN_LINE_WIDTH;
         params[1] = (GLint) MAX_LINE_WIDTH;
         break;
@@ -3441,6 +3448,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
         *params = (GLint) POINT_SIZE_GRANULARITY;
         break;
       case GL_POINT_SIZE_RANGE:
+      case GL_ALIASED_POINT_SIZE_RANGE:
         params[0] = (GLint) MIN_POINT_SIZE;
         params[1] = (GLint) MAX_POINT_SIZE;
         break;