X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fvtxfmt.h;h=8bbc54964daa789a68fba2522a5d312e9f7fd5d3;hb=cfaf217135d8a8e903b3fbf380f18170df018f0c;hp=25a458936e7893db73fba8911c36df4dd8a01f5b;hpb=22144ab7552f0799bcfca506bf4ffa7f70a06649;p=mesa.git

diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index 25a458936e7..8bbc54964da 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -1,10 +1,15 @@
-/* $Id: vtxfmt.h,v 1.4 2001/03/12 00:48:39 gareth Exp $ */
+/**
+ * \file vtxfmt.h
+ * 
+ * \author Keith Whitwell <keith@tungstengraphics.com>
+ * \author Gareth Hughes
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  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"),
@@ -22,20 +27,33 @@
  * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Keith Whitwell <keithw@valinux.com>
- *    Gareth Hughes <gareth@valinux.com>
  */
 
+
 #ifndef _VTXFMT_H_
 #define _VTXFMT_H_
 
-extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
+#include "compiler.h"
+#include "mfeatures.h"
+#include "mtypes.h"
+
+#if FEATURE_beginend
+
+extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
+extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
+
+#else /* FEATURE_beginend */
+
+static INLINE void
+_mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
+{
+}
 
-extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
-extern void _mesa_install_save_vtxfmt( GLcontext *ctx, GLvertexformat *vfmt );
+static INLINE void
+_mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
+{
+}
 
-extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx );
+#endif /* FEATURE_beginend */
 
-#endif
+#endif /* _VTXFMT_H_ */