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/state.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/state.h')
| -rw-r--r-- | src/mesa/main/state.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h index 79f2f6beb0..29db08a0b9 100644 --- a/src/mesa/main/state.h +++ b/src/mesa/main/state.h @@ -1,6 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 + * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * @@ -29,16 +29,21 @@ #include "mtypes.h" extern void -_mesa_update_state( GLcontext *ctx ); +_mesa_update_state(GLcontext *ctx); /* As above but can only be called between _mesa_lock_context_textures() and * _mesa_unlock_context_textures(). */ extern void -_mesa_update_state_locked( GLcontext *ctx ); +_mesa_update_state_locked(GLcontext *ctx); + + +extern void +_mesa_set_varying_vp_inputs(GLcontext *ctx, GLbitfield varying_inputs); + + +extern void +_mesa_set_vp_override(GLcontext *ctx, GLboolean flag); -void -_mesa_set_varying_vp_inputs( GLcontext *ctx, - GLbitfield varying_inputs ); #endif |