diff options
| author | Eric Anholt <eric@anholt.net> | 2009-05-15 11:41:42 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-06-17 11:06:25 -0700 |
| commit | fbd554d07456cf393a20cb86d1c0e81c416843aa (patch) | |
| tree | 76c7fe3a86e744a89eb0ac32468793517f65ce11 | |
| parent | 6e0df938d4504acc97012dc51002459d1d9f309a (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
(cherry picked from commit 5c5a46884899ea25cdf25545d6ab3d9a74eafa3a)
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_tex_layout.c | 5 |
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 d44a2f47b3..7cc1c096e4 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); |