diff options
author | Brian <brian@nostromo.localnet.net> | 2007-03-27 09:51:52 -0600 |
---|---|---|
committer | Brian <brian@nostromo.localnet.net> | 2007-03-27 09:51:52 -0600 |
commit | 3e45db67294faaf0a06c42bdd6dbdb96f87c8801 (patch) | |
tree | b8dc873e8449e4f53e0acab6d410f8ad0b60e68c /src/mesa/main/mtypes.h | |
parent | 3b8ab881312f36a948913653ed3c471017f811f0 (diff) |
Restore the UseTexEnvProgram logic.
Was removed during glsl-compiler work. Still need to go back and revisit this
because of the interaction with fragment shaders...
Diffstat (limited to 'src/mesa/main/mtypes.h')
-rw-r--r-- | src/mesa/main/mtypes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 828b0f2384..4fc98f4628 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1987,6 +1987,7 @@ struct gl_fragment_program_state { GLboolean Enabled; /**< User-set fragment program enable flag */ GLboolean _Enabled; /**< Fragment program enabled and valid? */ + GLboolean _Active; struct gl_fragment_program *Current; /**< User-bound fragment program */ /** Currently enabled and valid program (including internal programs @@ -1998,6 +1999,7 @@ struct gl_fragment_program_state /** Should fixed-function texturing be implemented with a fragment prog? */ GLboolean _MaintainTexEnvProgram; + GLboolean _UseTexEnvProgram; /** Program to emulate fixed-function texture env/combine (see above) */ struct gl_fragment_program *_TexEnvProgram; |