diff options
| -rw-r--r-- | src/mesa/main/context.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/polygon.c | 7 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 986dbc5aca9..b81a57badb6 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.177 2002/09/27 02:45:37 brianp Exp $ */ +/* $Id: context.c,v 1.178 2002/10/02 22:05:56 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1270,7 +1270,6 @@ init_attrib_groups( GLcontext *ctx ) ctx->Polygon.StippleFlag = GL_FALSE; ctx->Polygon.OffsetFactor = 0.0F; ctx->Polygon.OffsetUnits = 0.0F; - ctx->Polygon.OffsetMRD = 0.0F; ctx->Polygon.OffsetPoint = GL_FALSE; ctx->Polygon.OffsetLine = GL_FALSE; ctx->Polygon.OffsetFill = GL_FALSE; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 5a7eb53125d..dfe1ad883e3 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.90 2002/10/02 21:44:08 brianp Exp $ */ +/* $Id: mtypes.h,v 1.91 2002/10/02 22:05:55 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -699,7 +699,6 @@ struct gl_polygon_attrib { GLenum CullFaceMode; /* Culling mode GL_FRONT or GL_BACK */ GLfloat OffsetFactor; /* Polygon offset factor, from user */ GLfloat OffsetUnits; /* Polygon offset units, from user */ - GLfloat OffsetMRD; /* = OffsetUnits * visual->MRD */ GLboolean OffsetPoint; /* Offset in GL_POINT mode */ GLboolean OffsetLine; /* Offset in GL_LINE mode */ GLboolean OffsetFill; /* Offset in GL_FILL mode */ diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index 95371579fad..91c3933b543 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -1,10 +1,10 @@ -/* $Id: polygon.c,v 1.23 2002/06/15 02:38:16 brianp Exp $ */ +/* $Id: polygon.c,v 1.24 2002/10/02 22:05:58 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 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"), @@ -195,7 +195,6 @@ _mesa_PolygonOffset( GLfloat factor, GLfloat units ) FLUSH_VERTICES(ctx, _NEW_POLYGON); ctx->Polygon.OffsetFactor = factor; ctx->Polygon.OffsetUnits = units; - ctx->Polygon.OffsetMRD = units * ctx->MRD; if (ctx->Driver.PolygonOffset) ctx->Driver.PolygonOffset( ctx, factor, units ); |