aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2012-08-17 16:08:40 -0700
committerIan Romanick <[email protected]>2012-08-29 15:09:37 -0700
commit29512df6355706cc678d3994185c20c4d66b57c4 (patch)
treed0a788e7f44ac1b94759f203728277f638079b5a /src/mesa
parent7e1cab09a155a0f986342323624f460340de355f (diff)
mesa: Disallow wide lines in forward compatible context
Signed-off-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/lines.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
index 79bf5679d8a..e400b391325 100644
--- a/src/mesa/main/lines.c
+++ b/src/mesa/main/lines.c
@@ -51,6 +51,23 @@ _mesa_LineWidth( GLfloat width )
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;