X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ffeedback.h;h=cc4cf15a8330bed71a08968f7a809279a91b8f85;hb=26a26e9992d243dbdcd2f7f9a47723fe5cf060d2;hp=7a648f444fc36173b33974b370b4cdc2bf0d9ab9;hpb=e128cc205e30540597ecd57849060a6bf4714d9f;p=mesa.git

diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 7a648f444fc..cc4cf15a833 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -27,26 +27,22 @@
 #define FEEDBACK_H
 
 
+#include "main/mfeatures.h"
 #include "main/mtypes.h"
 
 
-#if FEATURE_feedback
-
-#define _MESA_INIT_FEEDBACK_FUNCTIONS(driver, impl) \
-   do {                                             \
-      (driver)->RenderMode = impl ## RenderMode;    \
-   } while (0)
+extern GLint GLAPIENTRY
+_mesa_RenderMode( GLenum mode );
 
 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 )
+static inline void
+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
 {
    if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
       ctx->Feedback.Buffer[ctx->Feedback.Count] = token;
@@ -56,50 +52,14 @@ _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
 _mesa_init_feedback_dispatch(struct _glapi_table *disp);
 
-#else /* FEATURE_feedback */
-
-#define _MESA_INIT_FEEDBACK_FUNCTIONS(driver, impl) do { } while (0)
-
-static INLINE void
-_mesa_feedback_vertex( GLcontext *ctx,
-                       const GLfloat win[4],
-                       const GLfloat color[4],
-                       GLfloat index,
-                       const GLfloat texcoord[4] )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-
-static INLINE void
-_mesa_feedback_token( GLcontext *ctx, GLfloat token )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_update_hitflag( GLcontext *ctx, GLfloat z )
-{
-   /* render mode is always GL_RENDER */
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_init_feedback_dispatch(struct _glapi_table *disp)
-{
-}
-
-#endif /* FEATURE_feedback */
 
 extern void
-_mesa_init_feedback( GLcontext *ctx );
+_mesa_init_feedback( struct gl_context *ctx );
 
 #endif /* FEEDBACK_H */