summaryrefslogtreecommitdiff
path: root/src/mesa/main/mtypes.h
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2005-12-12 12:57:08 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2005-12-12 12:57:08 +0000
commit40332059e4f7b289e5524d10c5565232d27bffbe (patch)
tree4ae2ea2ddf811c2d48c9eb40baa0f2f128d9dd3d /src/mesa/main/mtypes.h
parent3e1a5a38ae1d5f47d4a30fde2160ae1132cdd98b (diff)
Split _MaintainTexEnvProgram into two flags _Maintain and _Use. This
restores the ability to run the software driver with program TNL but tradtional swrast.
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r--src/mesa/main/mtypes.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3a7ae03b45..81f10cb1f7 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2803,8 +2803,9 @@ struct __GLcontextRec
struct fragment_program *_TexEnvProgram; /**< Texture state as fragment program */
struct vertex_program *_TnlProgram; /**< Fixed func TNL state as vertex program */
- GLboolean _MaintainTexEnvProgram;
GLboolean _MaintainTnlProgram;
+ GLboolean _MaintainTexEnvProgram;
+ GLboolean _UseTexEnvProgram;
struct gl_query_state Query; /**< GL_ARB_occlusion_query */