diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /mesalib/src/mesa/main/feedback.h | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
Diffstat (limited to 'mesalib/src/mesa/main/feedback.h')
| -rw-r--r-- | mesalib/src/mesa/main/feedback.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/feedback.h b/mesalib/src/mesa/main/feedback.h index cc4cf15a8..a697dc0d2 100644 --- a/mesalib/src/mesa/main/feedback.h +++ b/mesalib/src/mesa/main/feedback.h @@ -31,7 +31,21 @@ #include "main/mtypes.h" -extern GLint GLAPIENTRY +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 @@ -56,10 +70,6 @@ _mesa_update_hitflag( struct gl_context *ctx, GLfloat z ); extern void -_mesa_init_feedback_dispatch(struct _glapi_table *disp); - - -extern void _mesa_init_feedback( struct gl_context *ctx ); #endif /* FEEDBACK_H */ |