summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/state.h
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2006-11-01 14:21:57 +0000
committerKeith Whitwell <[email protected]>2006-11-01 14:21:57 +0000
commit5ac93f86210eb5c2a8dee74ec19b0ecd54376863 (patch)
treeea7acd0170a8b35a4a331b05c5910bc574c8f050 /src/mesa/main/state.h
parent232a489b41097b462fc0ad2b88f0df75a1abd4c3 (diff)
Merge texmem-0-3-branch.
Diffstat (limited to 'src/mesa/main/state.h')
-rw-r--r--src/mesa/main/state.h6
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