mesa: protect Elements against multiple definitions

[mesa.git] / src / mesa / main / state.h

diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 641c0c341326ebcebec0ede86286cc9c995e3d16..29db08a0b95a3b50611e2efe3ffb90584ea9c6d4 100644 (file)
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -1,10 +1,8 @@
-/* $Id: state.h,v 1.8 2002/02/13 00:53:19 keithw Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.3
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,23 +28,22 @@
 
 #include "mtypes.h"
 
-
 extern void
-_mesa_init_no_op_table(struct _glapi_table *exec, GLuint tableSize);
+_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_init_exec_table(struct _glapi_table *exec, GLuint tableSize);
+_mesa_update_state_locked(GLcontext *ctx);
 
-extern void
-_mesa_update_state( GLcontext *ctx );
 
 extern void
-_mesa_print_state( const char *msg, GLuint state );
+_mesa_set_varying_vp_inputs(GLcontext *ctx, GLbitfield varying_inputs);
 
-extern void
-_mesa_print_enable_flags( const char *msg, GLuint flags );
 
 extern void
-_mesa_allow_light_in_model( GLcontext *ctx, GLboolean flag );
+_mesa_set_vp_override(GLcontext *ctx, GLboolean flag);
+
 
 #endif