diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/context.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/points.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f8efa20796..aff60fb507 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.104 2000/11/13 20:02:56 keithw Exp $ */ +/* $Id: context.c,v 1.105 2000/11/15 16:38:40 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1153,14 +1153,14 @@ init_attrib_groups( GLcontext *ctx ) /* Point group */ ctx->Point.SmoothFlag = GL_FALSE; - ctx->Point.UserSize = 1.0; ctx->Point.Size = 1.0; + ctx->Point._Size = 1.0; ctx->Point.Params[0] = 1.0; ctx->Point.Params[1] = 0.0; ctx->Point.Params[2] = 0.0; ctx->Point._Attenuated = GL_FALSE; ctx->Point.MinSize = 0.0; - ctx->Point.MaxSize = (GLfloat) MAX_POINT_SIZE; + ctx->Point.MaxSize = ctx->Const.MaxPointSize; ctx->Point.Threshold = 1.0; /* Polygon group */ diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 8110cdfdd4..434e2e5400 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1,4 +1,4 @@ -/* $Id: get.c,v 1.39 2000/10/30 13:32:00 keithw Exp $ */ +/* $Id: get.c,v 1.40 2000/11/15 16:38:40 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -661,7 +661,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) *params = INT_TO_BOOL(ctx->Pixel.MapStoSsize); break; case GL_POINT_SIZE: - *params = FLOAT_TO_BOOL(ctx->Point.UserSize); + *params = FLOAT_TO_BOOL(ctx->Point.Size); break; case GL_POINT_SIZE_GRANULARITY: *params = FLOAT_TO_BOOL(ctx->Const.PointSizeGranularity ); @@ -1852,7 +1852,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) *params = (GLdouble) ctx->Pixel.MapStoSsize; break; case GL_POINT_SIZE: - *params = (GLdouble) ctx->Point.UserSize; + *params = (GLdouble) ctx->Point.Size; break; case GL_POINT_SIZE_GRANULARITY: *params = (GLdouble) ctx->Const.PointSizeGranularity; @@ -3044,7 +3044,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) *params = (GLfloat) ctx->Pixel.MapStoSsize; break; case GL_POINT_SIZE: - *params = (GLfloat) ctx->Point.UserSize; + *params = (GLfloat) ctx->Point.Size; break; case GL_POINT_SIZE_GRANULARITY: *params = (GLfloat) ctx->Const.PointSizeGranularity; @@ -4212,7 +4212,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) *params = ctx->Pixel.MapStoSsize; break; case GL_POINT_SIZE: - *params = (GLint) ctx->Point.UserSize; + *params = (GLint) ctx->Point.Size; break; case GL_POINT_SIZE_GRANULARITY: *params = (GLint) ctx->Const.PointSizeGranularity; diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index f5923374b7..b4de245e9f 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -1,4 +1,4 @@ -/* $Id: points.c,v 1.21 2000/11/13 20:02:56 keithw Exp $ */ +/* $Id: points.c,v 1.22 2000/11/15 16:38:40 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -52,9 +52,9 @@ _mesa_PointSize( GLfloat size ) return; } - if (ctx->Point.UserSize != size) { - ctx->Point.UserSize = size; - ctx->Point.Size = CLAMP(size, ctx->Const.MinPointSize, ctx->Const.MaxPointSize); + if (ctx->Point.Size != size) { + ctx->Point.Size = size; + ctx->Point._Size = CLAMP(size, ctx->Const.MinPointSize, ctx->Const.MaxPointSize); ctx->_TriangleCaps &= ~DD_POINT_SIZE; if (size != 1.0) ctx->_TriangleCaps |= DD_POINT_SIZE; |