diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-10-15 17:20:30 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-10-15 17:20:30 +0100 |
| commit | cf85e413ad7672c1cef73215222ca1caa8e48b30 (patch) | |
| tree | f6c22fe6664f2512a06653768ca27b17d2294134 /src/mesa/main/mtypes.h | |
| parent | d533a5d00ae2d0669e9da41718ee847de0c343aa (diff) | |
| parent | 055d986efefa310d6ffd1106e565ca2f5964159a (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/mesa/main/context.c
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 052da2c18e..7ad8cb244d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1987,6 +1987,8 @@ struct gl_vertex_program_state GLboolean CallbackEnabled; GLuint CurrentPosition; #endif + + GLboolean _Overriden; }; |