st/mesa: undo a couple static asserts

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

diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index fb6c23abe987d059377f59bb962f77b454f300f6..aac656879bf873ad78eb583c8bc7e66592a78076 100644 (file)
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -33,34 +33,24 @@
 #ifndef _VTXFMT_H_
 #define _VTXFMT_H_
 
-#if FEATURE_beginend
-
-extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
+#include "compiler.h"
+#include "mfeatures.h"
+#include "mtypes.h"
 
-extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
-extern void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
+#if FEATURE_beginend
 
-extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx );
+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_init_exec_vtxfmt( GLcontext *ctx )
-{
-}
-
-static INLINE void
-_mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
-{
-}
-
-static INLINE void
-_mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
+static inline void
+_mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
 {
 }
 
-static INLINE void
-_mesa_restore_exec_vtxfmt( GLcontext *ctx )
+static inline void
+_mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
 {
 }