diff options
| author | Brian Paul <[email protected]> | 2004-04-23 14:16:46 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2004-04-23 14:16:46 +0000 |
| commit | 6d460af6af77a0d5a5b568bcd6094b98e249ba93 (patch) | |
| tree | 08656028582b357d5c9730c521cc3e1770604c50 /src/mesa/main/api_validate.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/main/api_validate.c')
| -rw-r--r-- | src/mesa/main/api_validate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index 4e09c2855a5..d1c8f42e747 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -1,7 +1,6 @@ - /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * @@ -62,7 +61,7 @@ _mesa_validate_DrawElements(GLcontext *ctx, /* Always need vertex positions */ if (!ctx->Array.Vertex.Enabled - && !(ctx->VertexProgram.Enabled && ctx->Array.VertexAttrib[0].Enabled)) + && !(ctx->VertexProgram._Enabled && ctx->Array.VertexAttrib[0].Enabled)) return GL_FALSE; /* Vertex buffer object tests */ @@ -168,7 +167,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode, /* Always need vertex positions */ if (!ctx->Array.Vertex.Enabled - && !(ctx->VertexProgram.Enabled && ctx->Array.VertexAttrib[0].Enabled)) + && !(ctx->VertexProgram._Enabled && ctx->Array.VertexAttrib[0].Enabled)) return GL_FALSE; if (ctx->Const.CheckArrayBounds) { |