mesa: Support EXT_framebuffer_blit targets in ES 3.0 as well.

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

diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 1909009b565148e5fd9a8fe865967c85f20d7158..a697dc0d25bdf600c3069e343363746e8fda7a8a 100644 (file)
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -1,21 +1,20 @@
-/* $Id: feedback.h,v 1.3 1999/11/11 01:22:26 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  7.5
+ *
+ * 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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * 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
@@ -24,65 +23,53 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-
 #ifndef FEEDBACK_H
 #define FEEDBACK_H
 
 
-#include "types.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 gl_feedback_vertex( GLcontext *ctx,
-                                const GLfloat win[4],
-                                const GLfloat color[4], 
-                               GLuint index,
-                                const GLfloat texcoord[4] );
-
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
 
-extern void gl_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 );
-
-extern void
+void GLAPIENTRY
 _mesa_PushName( GLuint name );
+void GLAPIENTRY
+_mesa_PopName( void );
+GLint GLAPIENTRY
+_mesa_RenderMode( GLenum mode );
 
 extern void
-_mesa_PopName( void );
+_mesa_feedback_vertex( struct gl_context *ctx,
+                       const GLfloat win[4],
+                       const GLfloat color[4],
+                       const GLfloat texcoord[4] );
 
-extern GLint
-_mesa_RenderMode( GLenum mode );
 
+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 gl_feedback_points( GLcontext *ctx, GLuint first, GLuint last );
-extern void gl_feedback_line( GLcontext *ctx, GLuint v1, GLuint v2, GLuint pv );
-extern void gl_feedback_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
-                                 GLuint v2, GLuint pv );
 
-extern void gl_select_points( GLcontext *ctx, GLuint first, GLuint last );
-extern void gl_select_line( GLcontext *ctx, GLuint v1, GLuint v2, GLuint pv );
-extern void gl_select_triangle( GLcontext *ctx, GLuint v0, GLuint v1,
-                               GLuint v2, GLuint pv );
+extern void
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
+
 
-#endif
+extern void
+_mesa_init_feedback( struct gl_context *ctx );
 
+#endif /* FEEDBACK_H */