mesa: Directly include mfeatures.h in files that perform feature tests.

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

diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 72c2acd5eddf7e5476efd5cdc36bf1cc9e36b1c6..0039a0b4cb00fd389ebf18f881a515cb2daceb31 100644 (file)
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -27,22 +27,21 @@
 #define FEEDBACK_H
 
 
-#include "mtypes.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
 
 
-extern void
-_mesa_init_feedback( GLcontext *ctx );
+#if FEATURE_feedback
 
 extern void
-_mesa_feedback_vertex( GLcontext *ctx,
+_mesa_feedback_vertex( struct gl_context *ctx,
                        const GLfloat win[4],
                        const GLfloat color[4],
-                       GLfloat index,
                        const GLfloat texcoord[4] );
 
 
 static INLINE void
-_mesa_feedback_token( GLcontext *ctx, GLfloat token )
+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
 {
    if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
       ctx->Feedback.Buffer[ctx->Feedback.Count] = token;
@@ -52,32 +51,49 @@ _mesa_feedback_token( GLcontext *ctx, GLfloat token )
 
 
 extern void
-_mesa_update_hitflag( GLcontext *ctx, GLfloat z );
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
 
 
-extern void GLAPIENTRY
-_mesa_PassThrough( GLfloat token );
+extern void
+_mesa_init_feedback_dispatch(struct _glapi_table *disp);
 
-extern void GLAPIENTRY
-_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
+#else /* FEATURE_feedback */
 
-extern void GLAPIENTRY
-_mesa_SelectBuffer( GLsizei size, GLuint *buffer );
+#include "main/compiler.h"
 
-extern void GLAPIENTRY
-_mesa_InitNames( void );
+static INLINE void
+_mesa_feedback_vertex( struct gl_context *ctx,
+                       const GLfloat win[4],
+                       const GLfloat color[4],
+                       const GLfloat texcoord[4] )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
 
-extern void GLAPIENTRY
-_mesa_LoadName( GLuint name );
 
-extern void GLAPIENTRY
-_mesa_PushName( GLuint name );
+static INLINE void
+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
+
+static INLINE void
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
 
-extern void GLAPIENTRY
-_mesa_PopName( void );
+static INLINE void
+_mesa_init_feedback_dispatch(struct _glapi_table *disp)
+{
+}
 
-extern GLint GLAPIENTRY
-_mesa_RenderMode( GLenum mode );
+#endif /* FEATURE_feedback */
 
+extern void
+_mesa_init_feedback( struct gl_context *ctx );
 
-#endif
+#endif /* FEEDBACK_H */