diff options
author | marha <marha@users.sourceforge.net> | 2011-06-23 09:46:13 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-06-23 09:46:13 +0200 |
commit | e4b391377808d3a264dacdac7db76add26dee26c (patch) | |
tree | 509bf94b6db55f8837e3bb4d6e0c22eb672d1e26 /mesalib/src/mesa/state_tracker/st_format.h | |
parent | 9a95bb2454d9f38a5a8c3e6a10b764517006ac9f (diff) | |
parent | 97c96ddb6f56be198c2e8bf04ff25bc7b48dd1f2 (diff) | |
download | vcxsrv-e4b391377808d3a264dacdac7db76add26dee26c.tar.gz vcxsrv-e4b391377808d3a264dacdac7db76add26dee26c.tar.bz2 vcxsrv-e4b391377808d3a264dacdac7db76add26dee26c.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/main/state.c
mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_format.c
mesalib/src/mesa/state_tracker/st_format.h
pixman/pixman/pixman-arm-common.h
pixman/pixman/pixman-arm-neon.c
pixman/pixman/pixman-fast-path.c
pixman/pixman/pixman-fast-path.h
pixman/pixman/pixman.h
xorg-server/configure.ac
xorg-server/hw/xwin/man/XWin.man
xorg-server/manpages.am
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_format.h')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.h b/mesalib/src/mesa/state_tracker/st_format.h index d31e60711..fe93ab26e 100644 --- a/mesalib/src/mesa/state_tracker/st_format.h +++ b/mesalib/src/mesa/state_tracker/st_format.h @@ -52,6 +52,7 @@ st_pipe_format_to_mesa_format(enum pipe_format pipeFormat); extern enum pipe_format
st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
+ GLenum format, GLenum type,
enum pipe_texture_target target, unsigned sample_count,
unsigned tex_usage);
|