X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Flines.c;h=e400b391325b2f620b94edeaa7d939adfae88772;hb=f0dbd9255b5813d1567e1f09266f80e35dcbeb70;hp=81e179a9254880f25417f968d97ebf5497d65952;hpb=aad65fa112754074d24d0b5a8397db2663dc9454;p=mesa.git

diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
index 81e179a9254..e400b391325 100644
--- a/src/mesa/main/lines.c
+++ b/src/mesa/main/lines.c
@@ -43,11 +43,31 @@ _mesa_LineWidth( GLfloat width )
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glLineWidth %f\n", width);
+
    if (width<=0.0) {
       _mesa_error( ctx, GL_INVALID_VALUE, "glLineWidth" );
       return;
    }
 
+   /* Page 407 (page 423 of the PDF) of the OpenGL 3.0 spec says (in the list
+    * of deprecated functionality):
+    *
+    *     "Wide lines and line stipple - LineWidth is not deprecated, but
+    *     values greater than 1.0 will generate an INVALID_VALUE error;"
+    *
+    * This is one of the very few cases where functionality was deprecated but
+    * *NOT* removed in a later spec.  Therefore, we only disallow this in a
+    * forward compatible context.
+    */
+   if (ctx->API == API_OPENGL_CORE
+       && ((ctx->Const.ContextFlags & GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT)
+           != 0)) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glLineWidth" );
+      return;
+   }
+
    if (ctx->Line.Width == width)
       return;
 
@@ -77,6 +97,9 @@ _mesa_LineStipple( GLint factor, GLushort pattern )
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glLineStipple %d %u\n", factor, pattern);
+
    factor = CLAMP( factor, 1, 256 );
 
    if (ctx->Line.StippleFactor == factor &&