diff options
| author | Brian Paul <[email protected]> | 2003-04-08 02:27:16 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2003-04-08 02:27:16 +0000 |
| commit | 36a0a3252e1e20df69b53f70ba93bc74c4a4bf0e (patch) | |
| tree | 6c680de320af7a288fe70e5a95696bcf0f5faa56 /src/mesa/tnl/t_imm_exec.c | |
| parent | 0cebd5822a39ad3b3d7621f8e59efab329bfb5b9 (diff) | |
Added ctx->Texture._EnabledCoordUnits bitfield.
Fixed some vertex array / vertex program glitches with glDrawElements.
Fixed some fragment program runtime bugs.
Non-trivial Cg programs are running now.
Diffstat (limited to 'src/mesa/tnl/t_imm_exec.c')
| -rw-r--r-- | src/mesa/tnl/t_imm_exec.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c index 3c56e2ede28..a50922330f0 100644 --- a/src/mesa/tnl/t_imm_exec.c +++ b/src/mesa/tnl/t_imm_exec.c @@ -1,4 +1,4 @@ -/* $Id: t_imm_exec.c,v 1.45 2003/04/07 14:53:28 keithw Exp $ */ +/* $Id: t_imm_exec.c,v 1.46 2003/04/08 02:27:20 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -85,7 +85,9 @@ static void reset_input( GLcontext *ctx, IM->MaterialMask[IM->Start] = 0; IM->ArrayEltFlags = ~ctx->Array._Enabled; - IM->ArrayEltIncr = ctx->Array.Vertex.Enabled ? 1 : 0; + IM->ArrayEltIncr = (ctx->Array.Vertex.Enabled || + (ctx->VertexProgram.Enabled && + ctx->Array.VertexAttrib[0].Enabled)) ? 1 : 0; IM->ArrayEltFlush = ctx->Array.LockCount ? FLUSH_ELT_LAZY : FLUSH_ELT_EAGER; } @@ -486,7 +488,9 @@ void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM ) } else if ((IM->CopyOrFlag & VERT_BITS_DATA) == VERT_BIT_ELT && ctx->Array.LockCount && - ctx->Array.Vertex.Enabled) { + (ctx->Array.Vertex.Enabled || + (ctx->VertexProgram.Enabled && + ctx->Array.VertexAttrib[0].Enabled))) { exec_elt_cassette( ctx, IM ); } else { |