[Mesa-dev] [PATCH 10/11] intel: Drop dead preinitialization of align_w, align_h.

Eric Anholt eric at anholt.net
Fri Jun 10 13:38:22 PDT 2011


---
 src/mesa/drivers/dri/intel/intel_tex_layout.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex_layout.c b/src/mesa/drivers/dri/intel/intel_tex_layout.c
index 7493b42..2002777 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_layout.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_layout.c
@@ -57,7 +57,7 @@ void i945_miptree_layout_2d(struct intel_context *intel,
 			    struct intel_mipmap_tree *mt,
 			    uint32_t tiling, int nr_images)
 {
-   GLuint align_h = 2, align_w = 4;
+   GLuint align_h, align_w;
    GLuint level;
    GLuint x = 0;
    GLuint y = 0;
@@ -101,7 +101,7 @@ void i945_miptree_layout_2d(struct intel_context *intel,
 				   height, 1);
 
       if (mt->compressed)
-	 img_height = MAX2(1, height/4);
+	 img_height = MAX2(1, height + 3/4);
       else
 	 img_height = ALIGN(height, align_h);
 
-- 
1.7.5.3



More information about the mesa-dev mailing list