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_cb_texture.c | |
| 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_cb_texture.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index 80a440d18..ab5ff27b3 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -596,7 +596,7 @@ decompress_with_blit(struct gl_context * ctx, pipe_target = gl_target_to_pipe(gl_target); /* Find the best match for the format+type combo. */ - pipe_format = st_choose_format(pipe->screen, GL_RGBA8, format, type, + pipe_format = st_choose_format(st, GL_RGBA8, format, type, pipe_target, 0, bind, FALSE); if (pipe_format == PIPE_FORMAT_NONE) { /* unable to get an rgba format!?! */ |