X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Ffeedback.h;h=08bc7620e1bacb3ca72357f6e4889fc1f8004e80;hb=5cc6425d708a9b8c660c2f43f5e277c507c98bf0;hp=e1f47030c9150c4338dfc71a22a11f5c7400f92c;hpb=6dc85575000127630489b407c50a4b3ea87c9acb;p=mesa.git

diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index e1f47030c91..08bc7620e1b 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -1,13 +1,8 @@
-/**
- * \file feedback.h
- * Selection and feedback modes functions.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -22,61 +17,58 @@
  * 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"
-
-
-#define FEEDBACK_TOKEN( CTX, T )				\
-	if (CTX->Feedback.Count < CTX->Feedback.BufferSize) {	\
-	   CTX->Feedback.Buffer[CTX->Feedback.Count] = (GLfloat) (T); \
-	}							\
-	CTX->Feedback.Count++;
-
-
-extern void _mesa_init_feedback( GLcontext * ctx );
-
-extern void _mesa_feedback_vertex( GLcontext *ctx,
-                                const GLfloat win[4],
-                                const GLfloat color[4],
-				GLuint index,
-                                const GLfloat texcoord[4] );
+#include "main/mtypes.h"
 
 
-extern void _mesa_update_hitflag( GLcontext *ctx, GLfloat z );
-
-
-extern void
-_mesa_PassThrough( GLfloat token );
-
-extern void
+void GLAPIENTRY
 _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
-
-extern void
+void GLAPIENTRY
+_mesa_PassThrough( GLfloat token );
+void GLAPIENTRY
 _mesa_SelectBuffer( GLsizei size, GLuint *buffer );
-
-extern void
+void GLAPIENTRY
 _mesa_InitNames( void );
-
-extern 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_PushName( GLuint name );
+_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( struct gl_context *ctx, GLfloat token )
+{
+   if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
+      ctx->Feedback.Buffer[ctx->Feedback.Count] = token;
+   }
+   ctx->Feedback.Count++;
+}
+
 
 extern void
-_mesa_PopName( void );
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
 
-extern GLint
-_mesa_RenderMode( GLenum mode );
 
+extern void
+_mesa_init_feedback( struct gl_context *ctx );
 
-#endif
+#endif /* FEEDBACK_H */