intel: Add a width field to regions, and use it for making miptrees in TFP.

[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 163183487a84ec826e66cc8b6d489d439289d18b..f28fac8394b48c848e8cda5ef5deb14fe1348f3e 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -110,12 +110,17 @@ intel_miptree_create(struct intel_context *intel,
    mt = intel_miptree_create_internal(intel, target, internal_format,
                                      first_level, last_level, width0,
                                      height0, depth0, cpp, compress_byte);
-   if (!mt)
+   /*
+    * pitch == 0 indicates the null texture
+    */
+   if (!mt || !mt->pitch)
       return NULL;
 
-   assert (mt->pitch);
    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);
@@ -139,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;
@@ -263,13 +268,21 @@ intel_miptree_match_image(struct intel_mipmap_tree *mt,
 {
    /* Images with borders are never pulled into mipmap trees. 
     */
-   if (image->Border) 
+   if (image->Border ||
+       ((image->_BaseFormat == GL_DEPTH_COMPONENT) &&
+        ((image->TexObject->WrapS == GL_CLAMP_TO_BORDER) ||
+         (image->TexObject->WrapT == GL_CLAMP_TO_BORDER)))) 
       return GL_FALSE;
 
    if (image->InternalFormat != mt->internal_format ||
        image->IsCompressed != mt->compressed)
       return GL_FALSE;
 
+   if (!image->IsCompressed &&
+       !mt->compressed &&
+       image->TexFormat->TexelBytes != mt->cpp)
+      return GL_FALSE;
+
    /* Test image dimensions against the base level image adjusted for
     * minification.  This will also catch images not present in the
     * tree, changed targets, etc.
@@ -324,7 +337,7 @@ intel_miptree_set_image_offset(struct intel_mipmap_tree *mt,
 
    assert(img < mt->level[level].nr_images);
 
-   mt->level[level].image_offset[img] = (x + y * mt->pitch);
+   mt->level[level].image_offset[img] = (x + y * mt->pitch) * mt->cpp;
 
    DBG("%s level %d img %d pos %d,%d image_offset %x\n",
        __FUNCTION__, level, img, x, y, mt->level[level].image_offset[img]);
@@ -355,7 +368,7 @@ intel_miptree_image_offset(struct intel_mipmap_tree *mt,
 {
    if (mt->target == GL_TEXTURE_CUBE_MAP_ARB)
       return (mt->level[level].level_offset +
-             mt->level[level].image_offset[face] * mt->cpp);
+             mt->level[level].image_offset[face]);
    else
       return mt->level[level].level_offset;
 }
@@ -366,6 +379,8 @@ intel_miptree_image_offset(struct intel_mipmap_tree *mt,
  * Map a teximage in a mipmap tree.
  * \param row_stride  returns row stride in bytes
  * \param image_stride  returns image stride in bytes (for 3D textures).
+ * \param image_offsets pointer to array of pixel offsets from the returned
+ *       pointer to each depth image
  * \return address of mapping
  */
 GLubyte *
@@ -380,12 +395,16 @@ intel_miptree_image_map(struct intel_context * intel,
    if (row_stride)
       *row_stride = mt->pitch * mt->cpp;
 
-   if (image_offsets) {
-      if (mt->target == GL_TEXTURE_CUBE_MAP_ARB)
-                  memset(image_offsets, 0, mt->level[level].depth * sizeof(GLuint));
-         else
-                  memcpy(image_offsets, mt->level[level].image_offset,
-                          mt->level[level].depth * sizeof(GLuint));
+   if (mt->target == GL_TEXTURE_3D) {
+      int i;
+
+      for (i = 0; i < mt->level[level].depth; i++)
+        image_offsets[i] = mt->level[level].image_offset[i] / mt->cpp;
+   } else {
+      assert(mt->level[level].depth == 1);
+      assert(mt->target == GL_TEXTURE_CUBE_MAP ||
+            mt->level[level].image_offset[0] == 0);
+      image_offsets[0] = 0;
    }
 
    return (intel_region_map(intel, mt->region) +
@@ -426,7 +445,7 @@ intel_miptree_image_data(struct intel_context *intel,
         height = (height + 3) / 4;
       intel_region_data(intel,
                        dst->region,
-                       dst_offset + dst_depth_offset[i] * dst->cpp, /* dst_offset */
+                       dst_offset + dst_depth_offset[i], /* dst_offset */
                        0, 0,                             /* dstx, dsty */
                        src,
                        src_row_pitch,
@@ -463,10 +482,10 @@ intel_miptree_image_copy(struct intel_context *intel,
 
    for (i = 0; i < depth; i++) {
       intel_region_copy(intel,
-                        dst->region, dst_offset + dst_depth_offset[i] * dst->cpp,
+                        dst->region, dst_offset + dst_depth_offset[i],
                         0,
                         0,
-                        src->region, src_offset + src_depth_offset[i] * src->cpp,
+                        src->region, src_offset + src_depth_offset[i],
                         0, 0, width, height);
    }