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/pixel.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/pixel.h')
| -rw-r--r-- | mesalib/src/mesa/main/pixel.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/pixel.h b/mesalib/src/mesa/main/pixel.h index bfd76d934..433208cb6 100644 --- a/mesalib/src/mesa/main/pixel.h +++ b/mesalib/src/mesa/main/pixel.h @@ -41,15 +41,34 @@ struct _glapi_table; struct gl_context; -extern void GLAPIENTRY +void GLAPIENTRY +_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor ); +void GLAPIENTRY +_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values ); +void GLAPIENTRY +_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values ); +void GLAPIENTRY +_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values ); +void GLAPIENTRY +_mesa_GetnPixelMapfvARB( GLenum map, GLsizei bufSize, GLfloat *values ); +void GLAPIENTRY +_mesa_GetPixelMapfv( GLenum map, GLfloat *values ); +void GLAPIENTRY +_mesa_GetnPixelMapuivARB( GLenum map, GLsizei bufSize, GLuint *values ); +void GLAPIENTRY +_mesa_GetPixelMapuiv( GLenum map, GLuint *values ); +void GLAPIENTRY +_mesa_GetnPixelMapusvARB( GLenum map, GLsizei bufSize, GLushort *values ); +void GLAPIENTRY +_mesa_GetPixelMapusv( GLenum map, GLushort *values ); +void GLAPIENTRY _mesa_PixelTransferf(GLenum pname, GLfloat param); +void GLAPIENTRY +_mesa_PixelTransferi( GLenum pname, GLint param ); extern void _mesa_update_pixel( struct gl_context *ctx, GLuint newstate ); -extern void -_mesa_init_pixel_dispatch( struct _glapi_table * disp ); - extern void _mesa_init_pixel( struct gl_context * ctx ); |