Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / mesa / drivers / dri / intel / intel_mipmap_tree.c

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 9be7e02eff13433e1b21f20d4b4cda1d68eb4a71..f28fac8394b48c848e8cda5ef5deb14fe1348f3e 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -117,7 +117,10 @@ intel_miptree_create(struct intel_context *intel,
       return NULL;
 
    mt->region = intel_region_alloc(intel,
-                                  mt->cpp, mt->pitch, mt->total_height);
+                                  mt->cpp,
+                                  mt->pitch,
+                                  mt->total_height,
+                                  mt->pitch);
 
    if (!mt->region) {
        free(mt);
@@ -141,7 +144,7 @@ intel_miptree_create_for_region(struct intel_context *intel,
 
    mt = intel_miptree_create_internal(intel, target, internal_format,
                                      first_level, last_level,
-                                     region->pitch, region->height, depth0,
+                                     region->width, region->height, 1,
                                      region->cpp, compress_byte);
    if (!mt)
       return mt;