diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
| commit | 733df0059f04e3fd7e3265d3c80dd8029f939c60 (patch) | |
| tree | 5073edcb41611b86c9a62fa75c2c089fd2babf48 /src/mesa/state_tracker | |
| parent | 6fb364a1717858d8201b2caf234076ce5d4832ac (diff) | |
| parent | 5fa09846618ed702493f054a1d4b0ec2a28fbbd0 (diff) | |
Merge branch 'master' into gallium-new-formats
Conflicts:
src/gallium/auxiliary/util/u_format.csv
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 8cdd3ff2ae..390ada5489 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -934,7 +934,7 @@ st_get_tex_image(GLcontext * ctx, GLenum target, GLint level, GLubyte *dest; if (stImage->pt && - util_format_is_compressed(stImage->pt->format) && + util_format_is_s3tc(stImage->pt->format) && !compressed_dst) { /* Need to decompress the texture. * We'll do this by rendering a textured quad. |