diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-17 12:16:30 +0100 |
| commit | b3f7d4f6ce0d42d826f384223144936ba6797a10 (patch) | |
| tree | 2f329beffff890b402625bff8547e243071c47bd /mesalib/src/mesa/state_tracker/st_manager.h | |
| parent | c648afe73ef43a15094508d2dd439e05738735bf (diff) | |
| parent | 840c8745518b92303d40f6834e9c616587242231 (diff) | |
| download | vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.gz vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.tar.bz2 vcxsrv-b3f7d4f6ce0d42d826f384223144936ba6797a10.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXft pixman mesa git update 17 dec 2012
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_manager.h')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_manager.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_manager.h b/mesalib/src/mesa/state_tracker/st_manager.h index 6a9497839..f729cff1f 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.h +++ b/mesalib/src/mesa/state_tracker/st_manager.h @@ -36,8 +36,7 @@ struct st_context; struct pipe_surface * -st_manager_get_egl_image_surface(struct st_context *st, - void *eglimg, unsigned usage); +st_manager_get_egl_image_surface(struct st_context *st, void *eglimg); void st_manager_flush_frontbuffer(struct st_context *st); |