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/context.h | |
| 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/context.h')
| -rw-r--r-- | src/mesa/main/context.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index e55b383dec6..c59a8b21186 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -21,9 +21,9 @@ /* * Mesa 3-D graphics library - * Version: 4.1 + * Version: 6.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -375,9 +375,9 @@ do { \ (((CTX)->Light.Enabled && \ (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR) \ || (CTX)->Fog.ColorSumEnabled \ - || ((CTX)->VertexProgram.Enabled && \ + || ((CTX)->VertexProgram._Enabled && \ ((CTX)->VertexProgram.Current->InputsRead & VERT_BIT_COLOR1)) \ - || ((CTX)->FragmentProgram.Enabled && \ + || ((CTX)->FragmentProgram._Enabled && \ ((CTX)->FragmentProgram.Current->InputsRead & FRAG_BIT_COL1)) \ ) |