summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/lines.c
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2013-08-05 15:46:43 -0700
committerPaul Berry <stereotype441@gmail.com>2013-08-09 10:34:05 -0700
commit13fedf2883c7a1d7ff911b75eb88df00ba22eea7 (patch)
tree96cd003ada73bd1086c7b45b32464c4086d09afb /src/mesa/main/lines.c
parent836098f6b2dd275a2f557780d094cde13471f49d (diff)
main: Fix deprecation of glLineWidth()
From section E.1 (Profiles and Deprecated Features of OpenGL 3.0) of the OpenGL 3.0 spec: "LineWidth is not deprecated, but values greater than 1.0 will generate an INVALID VALUE error" From context it is clear that values greater than 1.0 should only generate an INVALID VALUE error in a forward-compatible context. The code was correctly quoting this spec text, but it was disallowing all line widths in forward-compatible contexts, instead of just widths greater than 1.0. This patch introduces the correct check, so that setting a line width of 1.0 or less is permitted. Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/lines.c')
-rw-r--r--src/mesa/main/lines.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
index 0df9d66b056..3c08ed2e713 100644
--- a/src/mesa/main/lines.c
+++ b/src/mesa/main/lines.c
@@ -62,7 +62,8 @@ _mesa_LineWidth( GLfloat width )
*/
if (ctx->API == API_OPENGL_CORE
&& ((ctx->Const.ContextFlags & GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT)
- != 0)) {
+ != 0)
+ && width > 1.0) {
_mesa_error( ctx, GL_INVALID_VALUE, "glLineWidth" );
return;
}