X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Ftnl%2Ft_vb_points.c;h=0f8578daa185abcd5ee34352e4a604f1203198da;hb=a2db9f9ff42435bc952ae1897b76b42610aeb7b7;hp=de866974473ec34459c9273a4d6968bbba8c5e30;hpb=b97e478fe90f612041e27852eb8c95f45467bde8;p=mesa.git diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c index de866974473..0f8578daa18 100644 --- a/src/mesa/tnl/t_vb_points.c +++ b/src/mesa/tnl/t_vb_points.c @@ -1,8 +1,7 @@ /* * Mesa 3-D graphics library - * Version: 6.1 * - * Copyright (C) 1999-2004 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"), @@ -17,16 +16,20 @@ * 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 "c99_math.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" @@ -38,86 +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 tnl_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) ? (1.0f / 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; + 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 tnl_pipeline_stage *d ) -{ - d->active = ctx->Point._Attenuated && !ctx->VertexProgram._Enabled; -} - -static GLboolean alloc_point_data( GLcontext *ctx, - struct tnl_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 tnl_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 ); + free( store ); stage->privatePtr = NULL; } } + const struct tnl_pipeline_stage _tnl_point_attenuation_stage = { "point size attenuation", /* name */ - _NEW_POINT|_NEW_PROGRAM, /* check_state */ - _NEW_POINT, /* run_state */ - GL_FALSE, /* active */ - _TNL_BIT_POS, /* inputs */ - _TNL_BIT_POS, /* 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 */ };