From: Brian Paul <brianp@vmware.com>
Date: Mon, 12 Oct 2009 23:40:33 +0000 (-0600)
Subject: intel: code clean-ups
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c932e21fa848562325f666dce5db3b09bc61bffa;p=mesa.git

intel: code clean-ups
---

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index d9d2edfe190..cc23a8905a3 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -476,16 +476,17 @@ intel_miptree_image_data(struct intel_context *intel,
 			 GLuint src_row_pitch,
 			 GLuint src_image_pitch)
 {
-   GLuint depth = dst->level[level].depth;
+   const GLuint depth = dst->level[level].depth;
    GLuint i;
-   GLuint height = 0;
 
    DBG("%s: %d/%d\n", __FUNCTION__, face, level);
    for (i = 0; i < depth; i++) {
       GLuint dst_offset = intel_miptree_image_offset(dst, face, level, i);
-      height = dst->level[level].height;
-      if(dst->compressed)
+      GLuint height = dst->level[level].height;
+
+      if (dst->compressed)
 	 height = (height + 3) / 4;
+
       intel_region_data(intel,
 			dst->region,
 			dst_offset,