From: Brian Paul Date: Thu, 26 Feb 2004 22:09:28 +0000 (+0000) Subject: check for invalid vertex/fragment program in glBegin X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ef3d3a7589eeabf0229cb3c6a9419d0eef2a681;p=mesa.git check for invalid vertex/fragment program in glBegin --- diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c index b69a1a612e1..a9a1c5bd5f8 100644 --- a/src/mesa/tnl/t_vtx_api.c +++ b/src/mesa/tnl/t_vtx_api.c @@ -992,6 +992,15 @@ static void GLAPIENTRY _tnl_Begin( GLenum mode ) { GET_CURRENT_CONTEXT( ctx ); + if ((ctx->VertexProgram.Enabled + && !ctx->VertexProgram.Current->Instructions) || + (ctx->FragmentProgram.Enabled + && !ctx->FragmentProgram.Current->Instructions)) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glBegin (invalid vertex/fragment program)"); + return; + } + if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) { TNLcontext *tnl = TNL_CONTEXT(ctx); int i;