Merge remote branch 'main/master' into radeon-rewrite

[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 9205627813c956af5bd3228a1f8640ef92733ea3..6e1e034e53d60936f237ea76495de4e4ae6da769 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -29,7 +29,7 @@
 #include "intel_mipmap_tree.h"
 #include "intel_regions.h"
 #include "intel_chipset.h"
-#include "enums.h"
+#include "main/enums.h"
 
 #define FILE_DEBUG_FLAG DEBUG_MIPTREE
 
@@ -103,7 +103,8 @@ intel_miptree_create(struct intel_context *intel,
                     GLuint last_level,
                     GLuint width0,
                     GLuint height0,
-                    GLuint depth0, GLuint cpp, GLuint compress_byte)
+                    GLuint depth0, GLuint cpp, GLuint compress_byte,
+                    GLboolean expect_accelerated_upload)
 {
    struct intel_mipmap_tree *mt;
 
@@ -111,13 +112,17 @@ intel_miptree_create(struct intel_context *intel,
                                      first_level, last_level, width0,
                                      height0, depth0, cpp, compress_byte);
    /*
-    * pitch == 0 indicates the null texture
+    * pitch == 0 || height == 0  indicates the null texture
     */
-   if (!mt || !mt->pitch)
+   if (!mt || !mt->pitch || !mt->total_height)
       return NULL;
 
    mt->region = intel_region_alloc(intel,
-                                  mt->cpp, mt->pitch, mt->total_height);
+                                  mt->cpp,
+                                  mt->pitch,
+                                  mt->total_height,
+                                  mt->pitch,
+                                  expect_accelerated_upload);
 
    if (!mt->region) {
        free(mt);
@@ -141,7 +146,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;
@@ -160,7 +165,7 @@ intel_miptree_create_for_region(struct intel_context *intel,
    mt->pitch = region->pitch;
 #endif
 
-   mt->region = region;
+   intel_region_reference(&mt->region, region);
 
    return mt;
  }
@@ -265,7 +270,10 @@ 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 ||
@@ -439,7 +447,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,
@@ -476,10 +484,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);
    }