summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-10-03 23:27:22 +0000
committerBrian Paul <[email protected]>2002-10-03 23:27:22 +0000
commita42e7c9172f1c41dd15da739274cb83a827c31a3 (patch)
tree0306cc3cad04fcabf6fca8e00a485f83ea9f2bf8 /src/mesa
parentbe99e845bd7979fe46d38d9b294c1ba0a0aa95b8 (diff)
record GL_INVALID_VALUE in glVertexAttrib*NV() if index > 15
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/tnl/t_imm_api.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index f5a977b6002..7aea94c3fac 100644
--- a/src/mesa/tnl/t_imm_api.c
+++ b/src/mesa/tnl/t_imm_api.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_api.c,v 1.31 2002/09/03 18:05:52 brianp Exp $ */
+/* $Id: t_imm_api.c,v 1.32 2002/10/03 23:27:22 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -375,6 +375,7 @@ void
_tnl_End(void)
{
GET_CURRENT_CONTEXT(ctx);
+
_tnl_end( ctx );
/* Need to keep save primitive uptodate in COMPILE and
@@ -1150,6 +1151,10 @@ _tnl_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w
_tnl_flush_immediate( NULL, IM );
}
}
+ else {
+ GET_CURRENT_CONTEXT(ctx);
+ _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribNV(index > 15)");
+ }
}
static void
@@ -1167,6 +1172,10 @@ _tnl_VertexAttrib4fvNV( GLuint index, const GLfloat *v )
_tnl_flush_immediate( NULL, IM );
}
}
+ else {
+ GET_CURRENT_CONTEXT(ctx);
+ _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribNV(index > 15)");
+ }
}