diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-24 16:06:21 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-24 16:06:21 -0600 |
| commit | 29d27229a95837d085db785a2b4abb654457dafa (patch) | |
| tree | 0a03c9dbe3e55fa9676137750da1ee465379b978 /src/mesa/main/mtypes.h | |
| parent | fd56bee6c4de28da194333f93b52c40f1deb6163 (diff) | |
| parent | 940ca2e837efe45caae1cf1d9665f6736347705d (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/vbo/vbo_exec_array.c
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index ae169fb9db..54fa8981dd 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2080,6 +2080,7 @@ struct gl_shader_state GLboolean EmitContReturn; /**< Emit CONT/RET opcodes? */ GLboolean EmitCondCodes; /**< Use condition codes? */ GLboolean EmitComments; /**< Annotated instructions */ + GLboolean EmitNVTempInitialization; /**< 0-fill NV temp registers */ void *MemPool; GLbitfield Flags; /**< Mask of GLSL_x flags */ struct gl_sl_pragmas DefaultPragmas; /**< Default #pragma settings */ |