@@ -1,4 +1,4 @@ | |||
/* $Id: attrib.c,v 1.17 2000/02/27 20:38:15 keithw Exp $ */ | |||
/* $Id: attrib.c,v 1.18 2000/03/03 18:55:45 brianp Exp $ */ | |||
/* | |||
* Mesa 3-D graphics library | |||
@@ -639,6 +639,11 @@ _mesa_PopAttrib(void) | |||
(*ctx->Driver.Enable)( ctx, GL_LINE_SMOOTH, ctx->Line.SmoothFlag ); | |||
(*ctx->Driver.Enable)( ctx, GL_LINE_STIPPLE, ctx->Line.StippleFlag ); | |||
} | |||
if (ctx->Driver.LineStipple) | |||
(*ctx->Driver.LineStipple)(ctx, ctx->Line.StippleFactor, | |||
ctx->Line.StipplePattern); | |||
if (ctx->Driver.LineWidth) | |||
(*ctx->Driver.LineWidth)(ctx, ctx->Line.Width); | |||
break; | |||
case GL_LIST_BIT: | |||
MEMCPY( &ctx->List, attr->data, sizeof(struct gl_list_attrib) ); |
@@ -1,4 +1,4 @@ | |||
/* $Id: dd.h,v 1.14 2000/03/03 17:54:56 brianp Exp $ */ | |||
/* $Id: dd.h,v 1.15 2000/03/03 18:55:45 brianp Exp $ */ | |||
/* | |||
* Mesa 3-D graphics library | |||
@@ -727,6 +727,7 @@ struct dd_function_table { | |||
GLenum pname, const GLfloat *params, GLint nparams ); | |||
void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params); | |||
void (*LineStipple)(GLcontext *ctx, GLint factor, GLushort pattern ); | |||
void (*LineWidth)(GLcontext *ctx, GLfloat width); | |||
void (*LogicOpcode)(GLcontext *ctx, GLenum opcode); | |||
void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode); | |||
void (*PolygonStipple)(GLcontext *ctx, const GLubyte *mask ); |
@@ -1,4 +1,4 @@ | |||
/* $Id: lines.c,v 1.8 2000/02/27 20:38:15 keithw Exp $ */ | |||
/* $Id: lines.c,v 1.9 2000/03/03 18:55:45 brianp Exp $ */ | |||
/* | |||
* Mesa 3-D graphics library | |||
@@ -58,6 +58,8 @@ _mesa_LineWidth( GLfloat width ) | |||
ctx->TriangleCaps &= ~DD_LINE_WIDTH; | |||
if (width != 1.0) ctx->TriangleCaps |= DD_LINE_WIDTH; | |||
ctx->NewState |= NEW_RASTER_OPS; | |||
if (ctx->Driver.LineWidth) | |||
(*ctx->Driver.LineWidth)(ctx, width); | |||
} | |||
} | |||