summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2009-08-05 01:12:16 +0200
committerRoland Scheidegger <sroland@vmware.com>2009-08-05 01:13:22 +0200
commit15f5f839b1a52a49bb60e73625b8c6b2f73a75e8 (patch)
treeafffdee8a06429e6778896db76ea0882568947cb /src/mesa
parent80cab49481b0c832f161bd61e9889d7bcd9f542a (diff)
radeon: fix miptree comparison breakage
another case of image never matching miptree in case of compressed textures
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
index 02e0dc7774..d4082bf68f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
+++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
@@ -326,7 +326,8 @@ GLboolean radeon_miptree_matches_image(radeon_mipmap_tree *mt,
if (face >= mt->faces || level < mt->firstLevel || level > mt->lastLevel)
return GL_FALSE;
- if (texImage->IsCompressed != mt->compressed)
+ if ((!texImage->IsCompressed && mt->compressed) ||
+ (texImage->IsCompressed && !mt->compressed))
return GL_FALSE;
if (!texImage->IsCompressed &&