glsl: Merge the lists of uniform blocks into the linked shader program.

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

diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index c6354b97bcdacb776dfaa13849c701ac6d8ed76f..c64db31344a2780f502c4fcfe45aa3bc4ecda282 100644 (file)
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -27,20 +27,24 @@
 #define FEEDBACK_H
 
 
+#include "main/mfeatures.h"
 #include "main/mtypes.h"
 
 
 #if FEATURE_feedback
 
+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],
                        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;
@@ -50,7 +54,7 @@ _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
@@ -60,8 +64,8 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp);
 
 #include "main/compiler.h"
 
-static INLINE void
-_mesa_feedback_vertex( GLcontext *ctx,
+static inline void
+_mesa_feedback_vertex( struct gl_context *ctx,
                        const GLfloat win[4],
                        const GLfloat color[4],
                        const GLfloat texcoord[4] )
@@ -71,21 +75,21 @@ _mesa_feedback_vertex( GLcontext *ctx,
 }
 
 
-static INLINE void
-_mesa_feedback_token( GLcontext *ctx, GLfloat token )
+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( GLcontext *ctx, GLfloat z )
+static inline void
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
 {
    /* render mode is always GL_RENDER */
    ASSERT_NO_FEATURE();
 }
 
-static INLINE void
+static inline void
 _mesa_init_feedback_dispatch(struct _glapi_table *disp)
 {
 }
@@ -93,6 +97,6 @@ _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 */