diff options
author | Alan Hourihane <[email protected]> | 2006-11-02 12:02:13 +0000 |
---|---|---|
committer | Alan Hourihane <[email protected]> | 2006-11-02 12:02:13 +0000 |
commit | 6d104cb932080c5c0d951fbc0ec6d30fb7ebef45 (patch) | |
tree | 17207f566d6eda4d3884ec03dfff6cdb5a1965ea /src/mesa/main/state.h | |
parent | 18d52f96bb1f20b1887b67e87506835bca05d73a (diff) |
merge current trunk into vbo branch
Diffstat (limited to 'src/mesa/main/state.h')
-rw-r--r-- | src/mesa/main/state.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h index 58cfcc41462..5240d4bf935 100644 --- a/src/mesa/main/state.h +++ b/src/mesa/main/state.h @@ -39,5 +39,11 @@ _mesa_init_exec_table(struct _glapi_table *exec); extern void _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 ); + #endif |