aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2009-05-15 11:41:42 -0700
committerEric Anholt <[email protected]>2009-05-15 11:43:39 -0700
commit5c5a46884899ea25cdf25545d6ab3d9a74eafa3a (patch)
tree802735d7a38f5be1c8681934ec73e2424be1eaaa
parentdc657f3929fbe03275b3fae4ef84f02e74b51114 (diff)
i915: Only use the new 945 cube layout for compressed textures.
The docs actually explain this, but not in a terribly clear manner. This nearly fixes the piglit cubemap testcase, except that something's going wrong with the nearest filtering at 2x2 sizes in the testcase. Looks good by visual inspection, though. Bug #21692
-rw-r--r--src/mesa/drivers/dri/i915/i915_tex_layout.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_tex_layout.c b/src/mesa/drivers/dri/i915/i915_tex_layout.c
index d44a2f47b37..7cc1c096e4b 100644
--- a/src/mesa/drivers/dri/i915/i915_tex_layout.c
+++ b/src/mesa/drivers/dri/i915/i915_tex_layout.c
@@ -454,7 +454,10 @@ i945_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree * mt)
{
switch (mt->target) {
case GL_TEXTURE_CUBE_MAP:
- i945_miptree_layout_cube(intel, mt);
+ if (mt->compressed)
+ i945_miptree_layout_cube(intel, mt);
+ else
+ i915_miptree_layout_cube(intel, mt);
break;
case GL_TEXTURE_3D:
i945_miptree_layout_3d(intel, mt);