diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-23 14:16:46 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-04-23 14:16:46 +0000 |
| commit | 6d460af6af77a0d5a5b568bcd6094b98e249ba93 (patch) | |
| tree | 08656028582b357d5c9730c521cc3e1770604c50 /src/mesa/tnl/t_array_import.c | |
| parent | 384800fe12e368f3489111de4572dbc8846a7dea (diff) | |
Added ctx->Vertex/FragmentProgram._Enable flags. Set when vertex/fragment
program is enabled AND the currently bound program is valid.
Check _Enable instead of Enable to prevent things from blowing up
when someone calls glEnable(GL_VERTEX_PROGRAM_ARB) without actually
defining a program.
Diffstat (limited to 'src/mesa/tnl/t_array_import.c')
| -rw-r--r-- | src/mesa/tnl/t_array_import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_array_import.c b/src/mesa/tnl/t_array_import.c index 7baeefe81e..0e50c6fa9a 100644 --- a/src/mesa/tnl/t_array_import.c +++ b/src/mesa/tnl/t_array_import.c @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.0 + * Version: 6.1 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * @@ -260,7 +260,7 @@ void _tnl_vb_bind_arrays( GLcontext *ctx, GLint start, GLint end) /* When vertex program mode is enabled, the generic vertex attribute * arrays have priority over the conventional vertex arrays. */ - if (ctx->VertexProgram.Enabled + if (ctx->VertexProgram._Enabled && ctx->Array.VertexAttrib[index].Enabled) { /* Use generic attribute array */ _tnl_import_attrib( ctx, index, GL_FALSE, GL_TRUE ); |