*
* \sa glLineWidth().
*/
-void GLAPIENTRY
-_mesa_LineWidth( GLfloat width )
+static ALWAYS_INLINE void
+line_width(struct gl_context *ctx, GLfloat width, bool no_error)
{
- GET_CURRENT_CONTEXT(ctx);
-
- if (MESA_VERBOSE & VERBOSE_API)
- _mesa_debug(ctx, "glLineWidth %f\n", width);
+ /* If width is unchanged, there can't be an error */
+ if (ctx->Line.Width == width)
+ return;
- if (width<=0.0) {
+ if (!no_error && width <= 0.0F) {
_mesa_error( ctx, GL_INVALID_VALUE, "glLineWidth" );
return;
}
* *NOT* removed in a later spec. Therefore, we only disallow this in a
* forward compatible context.
*/
- if (ctx->API == API_OPENGL_CORE
+ if (!no_error && ctx->API == API_OPENGL_CORE
&& ((ctx->Const.ContextFlags & GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT)
!= 0)
- && width > 1.0) {
+ && width > 1.0F) {
_mesa_error( ctx, GL_INVALID_VALUE, "glLineWidth" );
return;
}
- if (ctx->Line.Width == width)
- return;
-
- FLUSH_VERTICES(ctx, _NEW_LINE);
+ FLUSH_VERTICES(ctx, ctx->DriverFlags.NewLineState ? 0 : _NEW_LINE);
+ ctx->NewDriverState |= ctx->DriverFlags.NewLineState;
ctx->Line.Width = width;
if (ctx->Driver.LineWidth)
}
+void GLAPIENTRY
+_mesa_LineWidth_no_error(GLfloat width)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ line_width(ctx, width, true);
+}
+
+
+void GLAPIENTRY
+_mesa_LineWidth(GLfloat width)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ if (MESA_VERBOSE & VERBOSE_API)
+ _mesa_debug(ctx, "glLineWidth %f\n", width);
+
+ line_width(ctx, width, false);
+}
+
+
/**
* Set the line stipple pattern.
*
ctx->Line.StipplePattern == pattern)
return;
- FLUSH_VERTICES(ctx, _NEW_LINE);
+ FLUSH_VERTICES(ctx, ctx->DriverFlags.NewLineState ? 0 : _NEW_LINE);
+ ctx->NewDriverState |= ctx->DriverFlags.NewLineState;
ctx->Line.StippleFactor = factor;
ctx->Line.StipplePattern = pattern;
* Initializes __struct gl_contextRec::Line and line related constants in
* __struct gl_contextRec::Const.
*/
-void GLAPIENTRY
+void
_mesa_init_line( struct gl_context * ctx )
{
ctx->Line.SmoothFlag = GL_FALSE;