From: Eric Anholt <eric@anholt.net>
Date: Tue, 18 Mar 2008 22:29:11 +0000 (-0700)
Subject: [945] Remove conditional in 945 3D mipmap layout checking for cube layout.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=363d8785192e299963df520d53c221f494c8026c;p=mesa.git

[945] Remove conditional in 945 3D mipmap layout checking for cube layout.
---

diff --git a/src/mesa/drivers/dri/i915/i915_tex_layout.c b/src/mesa/drivers/dri/i915/i915_tex_layout.c
index dfd02112bad..2211ffa6772 100644
--- a/src/mesa/drivers/dri/i915/i915_tex_layout.c
+++ b/src/mesa/drivers/dri/i915/i915_tex_layout.c
@@ -287,17 +287,16 @@ i945_miptree_layout(struct intel_context *intel, struct intel_mipmap_tree * mt)
          pack_x_nr = 1;
 
          for (level = mt->first_level; level <= mt->last_level; level++) {
-            GLuint nr_images = mt->target == GL_TEXTURE_3D ? depth : 6;
             GLint x = 0;
             GLint y = 0;
             GLint q, j;
 
-            intel_miptree_set_level_info(mt, level, nr_images,
+            intel_miptree_set_level_info(mt, level, depth,
                                          0, mt->total_height,
                                          width, height, depth);
 
-            for (q = 0; q < nr_images;) {
-               for (j = 0; j < pack_x_nr && q < nr_images; j++, q++) {
+            for (q = 0; q < depth;) {
+               for (j = 0; j < pack_x_nr && q < depth; j++, q++) {
                   intel_miptree_set_image_offset(mt, level, q, x, y);
                   x += pack_x_pitch;
                }