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
(cherry picked from commit 5c5a468848)
This commit is contained in:
Eric Anholt
2009-05-15 11:41:42 -07:00
parent 6e0df938d4
commit fbd554d074

View File

@@ -454,7 +454,10 @@ i945_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree * mt)
{ {
switch (mt->target) { switch (mt->target) {
case GL_TEXTURE_CUBE_MAP: 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; break;
case GL_TEXTURE_3D: case GL_TEXTURE_3D:
i945_miptree_layout_3d(intel, mt); i945_miptree_layout_3d(intel, mt);