mesa: Fix printf format specifier warn of the ptrdiff_t

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

diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 72c2acd5eddf7e5476efd5cdc36bf1cc9e36b1c6..08bc7620e1bacb3ca72357f6e4889fc1f8004e80 100644 (file)
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.5
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
@@ -18,31 +17,45 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * 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.
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
  */
 
 #ifndef FEEDBACK_H
 #define FEEDBACK_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
-extern void
-_mesa_init_feedback( GLcontext *ctx );
+void GLAPIENTRY
+_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
+void GLAPIENTRY
+_mesa_PassThrough( GLfloat token );
+void GLAPIENTRY
+_mesa_SelectBuffer( GLsizei size, GLuint *buffer );
+void GLAPIENTRY
+_mesa_InitNames( void );
+void GLAPIENTRY
+_mesa_LoadName( GLuint name );
+void GLAPIENTRY
+_mesa_PushName( GLuint name );
+void GLAPIENTRY
+_mesa_PopName( void );
+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;
@@ -52,32 +65,10 @@ _mesa_feedback_token( GLcontext *ctx, GLfloat token )
 
 
 extern void
-_mesa_update_hitflag( GLcontext *ctx, GLfloat z );
-
-
-extern void GLAPIENTRY
-_mesa_PassThrough( GLfloat token );
-
-extern void GLAPIENTRY
-_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
-
-extern void GLAPIENTRY
-_mesa_SelectBuffer( GLsizei size, GLuint *buffer );
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
 
-extern void GLAPIENTRY
-_mesa_InitNames( void );
-
-extern void GLAPIENTRY
-_mesa_LoadName( GLuint name );
-
-extern void GLAPIENTRY
-_mesa_PushName( GLuint name );
-
-extern void GLAPIENTRY
-_mesa_PopName( void );
-
-extern GLint GLAPIENTRY
-_mesa_RenderMode( GLenum mode );
 
+extern void
+_mesa_init_feedback( struct gl_context *ctx );
 
-#endif
+#endif /* FEEDBACK_H */