GL_ARB_point_parameters support

5 files changed, 35 insertions, 21 deletions

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 56cf706fad..e2224a1046 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.84 2001/12/19 02:36:05 brianp Exp $ */
+/* $Id: dlist.c,v 1.85 2002/04/02 16:15:17 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -6216,7 +6216,10 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
    table->CompressedTexSubImage1DARB = save_CompressedTexSubImage1DARB;
    table->GetCompressedTexImageARB = exec_GetCompressedTexImageARB;
 
-   /* ARB ??. GL_ARB_window_pos */
+   /* ARB 14. GL_ARB_point_parameters */
+   /* re-use EXT_point_parameters functions */
+
+   /* ARB 25. GL_ARB_window_pos */
    table->WindowPos2dARB = save_WindowPos2dARB;
    table->WindowPos2dvARB = save_WindowPos2dvARB;
    table->WindowPos2fARB = save_WindowPos2fARB;
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index f9cdf07168..fe43e66838 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -1,4 +1,4 @@
-/* $Id: extensions.c,v 1.71 2002/03/23 16:33:53 brianp Exp $ */
+/* $Id: extensions.c,v 1.72 2002/04/02 16:15:17 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -60,6 +60,7 @@ static struct {
    { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
    { OFF, "GL_ARB_multisample",                F(ARB_multisample) },
    { OFF, "GL_ARB_multitexture",               F(ARB_multitexture) },
+   { OFF, "GL_ARB_point_parameters",           F(EXT_point_parameters) },
    { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
    { OFF, "GL_ARB_shadow_ambient",             F(SGIX_shadow_ambient) },
    { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
@@ -142,6 +143,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
       "GL_ARB_depth_texture",
       "GL_ARB_imaging",
       "GL_ARB_multitexture",
+      "GL_ARB_point_parameters",
       "GL_ARB_shadow",
       "GL_ARB_shadow_ambient",
       "GL_ARB_texture_border_clamp",
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index 54583c7b4e..a3e678811d 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -1,10 +1,10 @@
-/* $Id: points.c,v 1.31 2001/03/29 21:16:25 keithw Exp $ */
+/* $Id: points.c,v 1.32 2002/04/02 16:15:16 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  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"),
@@ -70,6 +70,9 @@ _mesa_PointSize( GLfloat size )
 
 
 
+/*
+ * Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
+ */
 void
 _mesa_PointParameterfEXT( GLenum pname, GLfloat param)
 {
@@ -77,12 +80,21 @@ _mesa_PointParameterfEXT( GLenum pname, GLfloat param)
 }
 
 
+
+/*
+ * Same for both GL_EXT_point_parameters and GL_ARB_point_parameters.
+ */
 void
 _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
+   if (!ctx->Extensions.EXT_point_parameters) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glPointParameterf[v]{EXT,ARB}(pname)");
+      return;
+   }
+
    switch (pname) {
       case GL_DISTANCE_ATTENUATION_EXT:
          {
@@ -109,7 +121,7 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
          break;
       case GL_POINT_SIZE_MIN_EXT:
          if (*params < 0.0F) {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glPointParameterfvEXT" );
+            _mesa_error( ctx, GL_INVALID_VALUE, "glPointParameterf[v]{EXT,ARB}(param)" );
             return;
          }
          if (ctx->Point.MinSize == *params)
@@ -119,7 +131,7 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
          break;
       case GL_POINT_SIZE_MAX_EXT:
          if (*params < 0.0F) {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glPointParameterfvEXT" );
+            _mesa_error( ctx, GL_INVALID_VALUE, "glPointParameterf[v]{EXT,ARB}(param)" );
             return;
          }
          if (ctx->Point.MaxSize == *params)
@@ -129,7 +141,7 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
          break;
       case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
          if (*params < 0.0F) {
-            _mesa_error( ctx, GL_INVALID_VALUE, "glPointParameterfvEXT" );
+            _mesa_error( ctx, GL_INVALID_VALUE, "glPointParameterf[v]{EXT,ARB}(param)" );
             return;
          }
          if (ctx->Point.Threshold == *params)
@@ -138,7 +150,7 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
          ctx->Point.Threshold = *params;
          break;
       default:
-         _mesa_error( ctx, GL_INVALID_ENUM, "glPointParameterfvEXT" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glPointParameterf[v]{EXT,ARB}(pname)" );
          return;
    }
 
diff --git a/src/mesa/main/points.h b/src/mesa/main/points.h
index 283432c6c1..55407491bb 100644
--- a/src/mesa/main/points.h
+++ b/src/mesa/main/points.h
@@ -1,10 +1,10 @@
-/* $Id: points.h,v 1.5 2001/03/12 00:48:38 gareth Exp $ */
+/* $Id: points.h,v 1.6 2002/04/02 16:15:17 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  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"),
@@ -25,9 +25,6 @@
  */
 
 
-
-
-
 #ifndef POINTS_H
 #define POINTS_H
 
@@ -38,14 +35,11 @@
 extern void
 _mesa_PointSize( GLfloat size );
 
-
 extern void
 _mesa_PointParameterfEXT( GLenum pname, GLfloat param);
 
-
 extern void
 _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params );
 
 
-
 #endif
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index ee8389a751..e705f14d4d 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.79 2002/03/29 17:27:59 brianp Exp $ */
+/* $Id: state.c,v 1.80 2002/04/02 16:15:17 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -506,7 +506,10 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    exec->CompressedTexSubImage1DARB = _mesa_CompressedTexSubImage1DARB;
    exec->GetCompressedTexImageARB = _mesa_GetCompressedTexImageARB;
 
-   /* ARB ??. GL_ARB_window_pos */
+   /* ARB 14. GL_ARB_point_parameters */
+   /* reuse EXT_point_parameters functions */
+
+   /* ARB 25. GL_ARB_window_pos */
    exec->WindowPos2dARB = _mesa_WindowPos2dARB;
    exec->WindowPos2dvARB = _mesa_WindowPos2dvARB;
    exec->WindowPos2fARB = _mesa_WindowPos2fARB;