X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Ftnl%2Ft_vb_points.c;h=932194d75f10b576e0bb101f35fa5c6f8bbfc0e6;hb=3d8d5b298a268b119d840bc9bae0ee9e0c9244a9;hp=06f2c8c14083e4484c735fc51fd30d0d710306f2;hpb=9ac51f57efe07ed43a1e4224a7f5daddec401b36;p=mesa.git

diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c
index 06f2c8c1408..932194d75f1 100644
--- a/src/mesa/tnl/t_vb_points.c
+++ b/src/mesa/tnl/t_vb_points.c
@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  7.0
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  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"),
@@ -18,16 +17,19 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *    Brian Paul
  */
 
-#include "mtypes.h"
-#include "imports.h"
+#include "main/glheader.h"
+#include "main/mtypes.h"
+#include "main/dd.h"
+#include "main/imports.h"
 #include "t_context.h"
 #include "t_pipeline.h"
 
@@ -39,85 +41,75 @@ struct point_stage_data {
 #define POINT_STAGE_DATA(stage) ((struct point_stage_data *)stage->privatePtr)
 
 
-/*
- * Compute attenuated point sizes
+/**
+ * Compute point size for each vertex from the vertex eye-space Z
+ * coordinate and the point size attenuation factors.
+ * Only done when point size attenuation is enabled and vertex program is
+ * disabled.
  */
-static GLboolean run_point_stage( GLcontext *ctx,
-				  struct gl_pipeline_stage *stage )
+static GLboolean
+run_point_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
 {
-   struct point_stage_data *store = POINT_STAGE_DATA(stage);
-   struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
-   const GLfloat (*eye)[4] = (const GLfloat (*)[4]) VB->EyePtr->data;
-   const GLfloat p0 = ctx->Point.Params[0];
-   const GLfloat p1 = ctx->Point.Params[1];
-   const GLfloat p2 = ctx->Point.Params[2];
-   const GLfloat pointSize = ctx->Point._Size;
-   GLfloat (*size)[4] = store->PointSize.data;
-   GLuint i;
-
-   if (stage->changed_inputs) {
-      /* XXX do threshold and min/max clamping here? */
+   if (ctx->Point._Attenuated && !ctx->VertexProgram._Current) {
+      struct point_stage_data *store = POINT_STAGE_DATA(stage);
+      struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
+      const GLfloat *eyeCoord = (GLfloat *) VB->EyePtr->data + 2;
+      const GLint eyeCoordStride = VB->EyePtr->stride / sizeof(GLfloat);
+      const GLfloat p0 = ctx->Point.Params[0];
+      const GLfloat p1 = ctx->Point.Params[1];
+      const GLfloat p2 = ctx->Point.Params[2];
+      const GLfloat pointSize = ctx->Point.Size;
+      GLfloat (*size)[4] = store->PointSize.data;
+      GLuint i;
+
       for (i = 0; i < VB->Count; i++) {
-	 const GLfloat dist = -eye[i][2];
-	 /* GLfloat dist = SQRTF(pos[0]*pos[0]+pos[1]*pos[1]+pos[2]*pos[2]);*/
-	 size[i][0] = pointSize / (p0 + dist * (p1 + dist * p2));
+         const GLfloat dist = FABSF(*eyeCoord);
+         const GLfloat q = p0 + dist * (p1 + dist * p2);
+         const GLfloat atten = (q != 0.0F) ? INV_SQRTF(q) : 1.0F;
+         size[i][0] = pointSize * atten; /* clamping done in rasterization */
+         eyeCoord += eyeCoordStride;
       }
-   }
 
-   VB->PointSizePtr = &store->PointSize;
+      VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->PointSize;
+   }
 
    return GL_TRUE;
 }
 
 
-/* If point size attenuation is on we'll compute the point size for
- * each vertex in a special pipeline stage.
- */
-static void check_point_size( GLcontext *ctx, struct gl_pipeline_stage *d )
-{
-   d->active = ctx->Point._Attenuated && !ctx->VertexProgram.Enabled;
-}
-
-static GLboolean alloc_point_data( GLcontext *ctx,
-				   struct gl_pipeline_stage *stage )
+static GLboolean
+alloc_point_data(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
 {
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
    struct point_stage_data *store;
-   stage->privatePtr = MALLOC(sizeof(*store));
+   stage->privatePtr = malloc(sizeof(*store));
    store = POINT_STAGE_DATA(stage);
    if (!store)
       return GL_FALSE;
 
    _mesa_vector4f_alloc( &store->PointSize, 0, VB->Size, 32 );
-
-   /* Now run the stage.
-    */
-   stage->run = run_point_stage;
-   return stage->run( ctx, stage );
+   return GL_TRUE;
 }
 
 
-static void free_point_data( struct gl_pipeline_stage *stage )
+static void
+free_point_data(struct tnl_pipeline_stage *stage)
 {
    struct point_stage_data *store = POINT_STAGE_DATA(stage);
    if (store) {
       _mesa_vector4f_free( &store->PointSize );
-      FREE( store );
-      stage->privatePtr = 0;
+      free( store );
+      stage->privatePtr = NULL;
    }
 }
 
-const struct gl_pipeline_stage _tnl_point_attenuation_stage =
+
+const struct tnl_pipeline_stage _tnl_point_attenuation_stage =
 {
    "point size attenuation",	/* name */
-   _NEW_POINT,			/* build_state_change */
-   _NEW_POINT,			/* run_state_change */
-   GL_FALSE,			/* active */
-   VERT_BIT_EYE,			/* inputs */
-   VERT_BIT_POINT_SIZE,		/* outputs */
-   0,				/* changed_inputs (temporary value) */
    NULL,			/* stage private data */
+   alloc_point_data,		/* alloc data */
    free_point_data,		/* destructor */
-   check_point_size,		/* check */
-   alloc_point_data		/* run -- initially set to alloc data */
+   NULL,
+   run_point_stage		/* run */
 };