From 24a32627d9a1b23323429b989bb5705a695fb4c1 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 15 Nov 2000 16:38:40 +0000 Subject: [PATCH] Replaced ctx->Point.Size with ctx->Point._Size Replaced ctx->Point.UserSize with ctx->Point.Size --- src/mesa/main/context.c | 6 +++--- src/mesa/main/get.c | 10 +++++----- src/mesa/main/points.c | 8 ++++---- src/mesa/swrast/s_points.c | 22 +++++++++++----------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f8efa207961..aff60fb5073 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 8110cdfdd44..434e2e54005 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 f5923374b7e..b4de245e9f6 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; diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c index e5360dff7d2..5c30c5f5a21 100644 --- a/src/mesa/swrast/s_points.c +++ b/src/mesa/swrast/s_points.c @@ -1,4 +1,4 @@ -/* $Id: s_points.c,v 1.4 2000/11/13 20:02:57 keithw Exp $ */ +/* $Id: s_points.c,v 1.5 2000/11/15 16:38:40 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -111,7 +111,7 @@ static void general_ci_point( GLcontext *ctx, SWvertex *vert ) { struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB; - const GLint isize = (GLint) (ctx->Point.Size + 0.5F); + const GLint isize = (GLint) (ctx->Point._Size + 0.5F); GLint radius = isize >> 1; GLint x0, x1, y0, y1; @@ -156,7 +156,7 @@ static void general_rgba_point( GLcontext *ctx, SWvertex *vert ) { struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB; - GLint isize = (GLint) (ctx->Point.Size + 0.5F); + GLint isize = (GLint) (ctx->Point._Size + 0.5F); GLint radius = isize >> 1; GLint x0, x1, y0, y1; @@ -216,7 +216,7 @@ textured_rgba_point( GLcontext *ctx, SWvertex *vert ) GLint x = (GLint) vert->win[0]; GLint y = (GLint) vert->win[1]; GLint z = (GLint) (vert->win[2]); - GLint isize = (GLint) (ctx->Point.Size + 0.5F); + GLint isize = (GLint) (ctx->Point._Size + 0.5F); GLfixed fog = FloatToFixed( vert->fog ); @@ -289,7 +289,7 @@ multitextured_rgba_point( GLcontext *ctx, SWvertex *vert ) GLint ix, iy; GLfloat texcoord[MAX_TEXTURE_UNITS][4]; GLint radius, u; - GLint isize = (GLint) (ctx->Point.Size + 0.5F); + GLint isize = (GLint) (ctx->Point._Size + 0.5F); GLfixed fog = FloatToFixed( vert->fog ); @@ -364,7 +364,7 @@ antialiased_rgba_point( GLcontext *ctx, SWvertex *vert ) { SWcontext *swrast = SWRAST_CONTEXT(ctx); struct pixel_buffer *PB = swrast->PB; - const GLfloat radius = ctx->Point.Size * 0.5F; + const GLfloat radius = ctx->Point._Size * 0.5F; const GLfloat rmin = radius - 0.7071F; /* 0.7071 = sqrt(2)/2 */ const GLfloat rmax = radius + 0.7071F; const GLfloat rmin2 = MAX2(0.0, rmin * rmin); @@ -505,7 +505,7 @@ static void dist_atten_general_ci_point( GLcontext *ctx, SWvertex *vert ) { struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB; - const GLfloat psize = ctx->Point.Size; + const GLfloat psize = ctx->Point._Size; GLfloat dist = attenuation_distance( ctx, vert->eye ); GLint x0, x1, y0, y1; GLint ix, iy; @@ -557,7 +557,7 @@ static void dist_atten_general_rgba_point( GLcontext *ctx, SWvertex *vert ) { struct pixel_buffer *PB = SWRAST_CONTEXT(ctx)->PB; - const GLfloat psize = ctx->Point.Size; + const GLfloat psize = ctx->Point._Size; GLfloat dist = attenuation_distance( ctx, vert->eye ); GLint x0, x1, y0, y1; GLint ix, iy; @@ -617,7 +617,7 @@ dist_atten_textured_rgba_point( GLcontext *ctx, SWvertex *vert ) { SWcontext *swrast = SWRAST_CONTEXT(ctx); struct pixel_buffer *PB = swrast->PB; - const GLfloat psize = ctx->Point.Size; + const GLfloat psize = ctx->Point._Size; GLfloat dist = attenuation_distance( ctx, vert->eye ); const GLint x = (GLint) vert->win[0]; @@ -710,7 +710,7 @@ dist_atten_antialiased_rgba_point( GLcontext *ctx, SWvertex *vert ) { SWcontext *swrast = SWRAST_CONTEXT(ctx); struct pixel_buffer *PB = swrast->PB; - const GLfloat psize = ctx->Point.Size; + const GLfloat psize = ctx->Point._Size; GLfloat dist = attenuation_distance( ctx, vert->eye ); if (ctx->Texture._ReallyEnabled) { @@ -918,7 +918,7 @@ _swrast_choose_point( GLcontext *ctx ) swrast->Point = textured_rgba_point; } } - else if (ctx->Point.Size==1.0) { + else if (ctx->Point._Size == 1.0) { /* size=1, any raster ops */ if (rgbmode) swrast->Point = size1_rgba_point; -- 2.30.2