ctx->Point._Size fix

This commit is contained in:
Rune Peterson
2007-02-10 18:19:43 -07:00
committed by Brian
parent b2d30ca0cb
commit 3bacb68c70
3 changed files with 7 additions and 26 deletions

View File

@@ -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);
@@ -231,26 +238,6 @@ _mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params)
/**
* 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.
*

View File

@@ -50,9 +50,6 @@ _mesa_PointParameterfEXT( GLenum pname, GLfloat param );
extern void GLAPIENTRY
_mesa_PointParameterfvEXT( GLenum pname, const GLfloat *params );
extern void
_mesa_update_point(GLcontext *ctx);
extern void
_mesa_init_point( GLcontext * ctx );

View File

@@ -1111,9 +1111,6 @@ _mesa_update_state_locked( GLcontext *ctx )
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 );