mesa: Branch 'master'

[Brian Paul]

 src/mesa/main/points.c |   27 +++++++--------------------
 src/mesa/main/points.h |    3 ---
 src/mesa/main/state.c  |    3 ---
 3 files changed, 7 insertions(+), 26 deletions(-)

New commits:
diff-tree 3bacb68c70e4a0813bf944061a97e727cbd89c43 (from b2d30ca0cb01a80ff440a4a07b293daa16486e12)
Author: Rune Peterson <rune at megahurts.dk>
Date:   Sat Feb 10 18:19:43 2007 -0700

    ctx->Point._Size fix

diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index c6b0324..9caa9ab 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -57,6 +57,13 @@ _mesa_PointSize( GLfloat size )
 
    FLUSH_VERTICES(ctx, _NEW_POINT);
    ctx->Point.Size = size;
+   ctx->Point._Size = CLAMP(ctx->Point.Size,
+			    ctx->Point.MinSize,
+			    ctx->Point.MaxSize);
+
+   ctx->Point._Attenuated = (ctx->Point.Params[0] != 1.0 ||
+                             ctx->Point.Params[1] != 0.0 ||
+                             ctx->Point.Params[2] != 0.0);
 
    if (ctx->Driver.PointSize)
       ctx->Driver.PointSize(ctx, size);
@@ -232,26 +239,6 @@ _mesa_PointParameterfvEXT( GLenum pname,
 
 
 /**
- * Update derived point-related state.
- */
-void
-_mesa_update_point(GLcontext *ctx)
-{
-   /* clamp to user-specified limits now, clamp to ctx->Const.Min/Max
-    * limits during rasterization.
-    */
-   ctx->Point._Size = CLAMP(ctx->Point.Size,
-			    ctx->Point.MinSize,
-			    ctx->Point.MaxSize);
-
-   ctx->Point._Attenuated = (ctx->Point.Params[0] != 1.0 ||
-                             ctx->Point.Params[1] != 0.0 ||
-                             ctx->Point.Params[2] != 0.0);
-}
-
-
-
-/**
  * Initialize the context point state.
  *
  * \param ctx GL context.
diff --git a/src/mesa/main/points.h b/src/mesa/main/points.h
index 56acd9e..951ff67 100644
--- a/src/mesa/main/points.h
+++ b/src/mesa/main/points.h
@@ -50,9 +50,6 @@ _mesa_PointParameterfEXT( GLenum pname, 
 extern void GLAPIENTRY
 _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params );
 
-extern void
-_mesa_update_point(GLcontext *ctx);
-
 extern void 
 _mesa_init_point( GLcontext * ctx );
 
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 55fb455..f4f73a5 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1111,9 +1111,6 @@ _mesa_update_state_locked( GLcontext *ct
    if (new_state & (_NEW_SCISSOR | _NEW_BUFFERS | _NEW_VIEWPORT))
       _mesa_update_draw_buffer_bounds( ctx );
 
-   if (new_state & _NEW_POINT)
-      _mesa_update_point( ctx );
-
    if (new_state & _NEW_LIGHT)
       _mesa_update_lighting( ctx );