[g3dvl] move z-coord generation for multiple render targets into vertex shader

[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 42adb4cb4a70f6dfd9355efe61bd6f856bb89d75..9c4e5c5ee8c9288108d22c63208ea08156cb1655 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -137,7 +137,7 @@ intel_miptree_create(struct intel_context *intel,
       return NULL;
    }
 
-   mt->region = intel_region_alloc(intel,
+   mt->region = intel_region_alloc(intel->intelScreen,
                                   tiling,
                                   mt->cpp,
                                   mt->total_width,
@@ -333,7 +333,6 @@ intel_miptree_image_map(struct intel_context * intel,
                         GLuint * row_stride, GLuint * image_offsets)
 {
    GLuint x, y;
-   DBG("%s \n", __FUNCTION__);
 
    if (row_stride)
       *row_stride = mt->region->pitch * mt->cpp;
@@ -348,6 +347,8 @@ intel_miptree_image_map(struct intel_context * intel,
         image_offsets[i] = x + y * mt->region->pitch;
       }
 
+      DBG("%s \n", __FUNCTION__);
+
       return intel_region_map(intel, mt->region);
    } else {
       assert(mt->level[level].depth == 1);
@@ -355,6 +356,9 @@ intel_miptree_image_map(struct intel_context * intel,
                                     &x, &y);
       image_offsets[0] = 0;
 
+      DBG("%s: (%d,%d) -> (%d, %d)/%d\n",
+         __FUNCTION__, face, level, x, y, mt->region->pitch * mt->cpp);
+
       return intel_region_map(intel, mt->region) +
         (x + y * mt->region->pitch) * mt->cpp;
    }
@@ -385,7 +389,6 @@ intel_miptree_image_data(struct intel_context *intel,
    const GLuint depth = dst->level[level].depth;
    GLuint i;
 
-   DBG("%s: %d/%d\n", __FUNCTION__, face, level);
    for (i = 0; i < depth; i++) {
       GLuint dst_x, dst_y, height;
 
@@ -395,6 +398,12 @@ intel_miptree_image_data(struct intel_context *intel,
       if(dst->compressed)
         height = (height + 3) / 4;
 
+      DBG("%s: %d/%d %p/%d -> (%d, %d)/%d (%d, %d)\n",
+         __FUNCTION__, face, level,
+         src, src_row_pitch * dst->cpp,
+         dst_x, dst_y, dst->region->pitch * dst->cpp,
+         dst->level[level].width, height);
+
       intel_region_data(intel,
                        dst->region, 0, dst_x, dst_y,
                        src,