diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-07 10:45:44 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-07 10:45:44 +0100 |
| commit | cbcf519f983c24f5d315b4abc194e5d147dc0ab7 (patch) | |
| tree | 3f9cafad0ae5ba278eb444c4ec85f53155e7050d /mesalib/src/mesa/state_tracker/st_format.h | |
| parent | 012567f7279756f1fcc4aee30e5e72f0938fe3da (diff) | |
| parent | 956c20498738c242726b5a42ed28db8572a90bed (diff) | |
| download | vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.gz vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.tar.bz2 vcxsrv-cbcf519f983c24f5d315b4abc194e5d147dc0ab7.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa fontconfig git update 7 Feb 2013
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_format.h')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.h b/mesalib/src/mesa/state_tracker/st_format.h index 50588d8d4..aee624d24 100644 --- a/mesalib/src/mesa/state_tracker/st_format.h +++ b/mesalib/src/mesa/state_tracker/st_format.h @@ -48,13 +48,13 @@ st_pipe_format_to_mesa_format(enum pipe_format pipeFormat); extern enum pipe_format -st_choose_format(struct pipe_screen *screen, GLenum internalFormat, +st_choose_format(struct st_context *st, GLenum internalFormat, GLenum format, GLenum type, enum pipe_texture_target target, unsigned sample_count, unsigned bindings, boolean allow_dxt); extern enum pipe_format -st_choose_renderbuffer_format(struct pipe_screen *screen, +st_choose_renderbuffer_format(struct st_context *st, GLenum internalFormat, unsigned sample_count); |