i965: Stop passing num_samples to intel_miptree_alloc_hiz().

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

diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index 3f21601a8a97693a6e896b4bbbd39d6bdc0467b9..eaa25617bab38b93d1db7d8e1f43e7a3029dbe02 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
@@ -21,12 +21,18 @@ intel_update_max_level(struct intel_texture_object *intelObj,
                       struct gl_sampler_object *sampler)
 {
    struct gl_texture_object *tObj = &intelObj->base;
+   int maxlevel;
 
    if (sampler->MinFilter == GL_NEAREST ||
        sampler->MinFilter == GL_LINEAR) {
-      intelObj->_MaxLevel = tObj->BaseLevel;
+      maxlevel = tObj->BaseLevel;
    } else {
-      intelObj->_MaxLevel = tObj->_MaxLevel;
+      maxlevel = tObj->_MaxLevel;
+   }
+
+   if (intelObj->_MaxLevel != maxlevel) {
+      intelObj->_MaxLevel = maxlevel;
+      intelObj->needs_validate = true;
    }
 }
 
@@ -55,6 +61,12 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
    /* What levels must the tree include at a minimum?
     */
    intel_update_max_level(intelObj, sampler);
+   if (intelObj->mt && intelObj->mt->first_level != tObj->BaseLevel)
+      intelObj->needs_validate = true;
+
+   if (!intelObj->needs_validate)
+      return true;
+
    firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]);
 
    /* Check tree can hold all active levels.  Check tree matches
@@ -94,7 +106,7 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
                                           depth,
                                          true,
                                           0 /* num_samples */,
-                                          INTEL_MSAA_LAYOUT_NONE);
+                                          false /* force_y_tiling */);
       if (!intelObj->mt)
          return false;
    }
@@ -111,7 +123,8 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
                 break;
 
          if (intelObj->mt != intelImage->mt) {
-            intel_miptree_copy_teximage(intel, intelImage, intelObj->mt);
+            intel_miptree_copy_teximage(intel, intelImage, intelObj->mt,
+                                        false /* invalidate */);
          }
 
          /* After we're done, we'd better agree that our layout is
@@ -122,108 +135,7 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
       }
    }
 
-   return true;
-}
-
-/**
- * \param mode  bitmask of GL_MAP_READ_BIT, GL_MAP_WRITE_BIT
- */
-static void
-intel_tex_map_image_for_swrast(struct intel_context *intel,
-                              struct intel_texture_image *intel_image,
-                              GLbitfield mode)
-{
-   int level;
-   int face;
-   struct intel_mipmap_tree *mt;
-   unsigned int x, y;
-
-   if (!intel_image || !intel_image->mt)
-      return;
-
-   level = intel_image->base.Base.Level;
-   face = intel_image->base.Base.Face;
-   mt = intel_image->mt;
-
-   for (int i = 0; i < mt->level[level].depth; i++)
-      intel_miptree_slice_resolve_depth(intel, mt, level, i);
-
-   if (mt->target == GL_TEXTURE_3D ||
-       mt->target == GL_TEXTURE_2D_ARRAY ||
-       mt->target == GL_TEXTURE_1D_ARRAY) {
-      int i;
-
-      /* ImageOffsets[] is only used for swrast's fetch_texel_3d, so we can't
-       * share code with the normal path.
-       */
-      for (i = 0; i < mt->level[level].depth; i++) {
-        intel_miptree_get_image_offset(mt, level, i, &x, &y);
-        intel_image->base.ImageOffsets[i] = x + y * mt->region->pitch;
-      }
-
-      DBG("%s \n", __FUNCTION__);
-
-      intel_image->base.Map = intel_region_map(intel, mt->region, mode);
-   } else {
-      assert(intel_image->base.Base.Depth == 1);
-      intel_miptree_get_image_offset(mt, level, face, &x, &y);
-
-      DBG("%s: (%d,%d) -> (%d, %d)/%d\n",
-         __FUNCTION__, face, level, x, y, mt->region->pitch * mt->cpp);
-
-      intel_image->base.Map = intel_region_map(intel, mt->region, mode) +
-        (x + y * mt->region->pitch) * mt->cpp;
-   }
-
-   intel_image->base.RowStride = mt->region->pitch;
-}
-
-static void
-intel_tex_unmap_image_for_swrast(struct intel_context *intel,
-                                struct intel_texture_image *intel_image)
-{
-   if (intel_image && intel_image->mt) {
-      intel_region_unmap(intel, intel_image->mt->region);
-      intel_image->base.Map = NULL;
-   }
-}
-
-/**
- * \param mode  bitmask of GL_MAP_READ_BIT, GL_MAP_WRITE_BIT
- */
-void
-intel_tex_map_images(struct intel_context *intel,
-                    struct intel_texture_object *intelObj,
-                    GLbitfield mode)
-{
-   GLuint nr_faces = _mesa_num_tex_faces(intelObj->base.Target);
-   int i, face;
-
-   DBG("%s\n", __FUNCTION__);
-
-   for (i = intelObj->base.BaseLevel; i <= intelObj->_MaxLevel; i++) {
-      for (face = 0; face < nr_faces; face++) {
-        struct intel_texture_image *intel_image =
-           intel_texture_image(intelObj->base.Image[face][i]);
-
-        intel_tex_map_image_for_swrast(intel, intel_image, mode);
-      }
-   }
-}
-
-void
-intel_tex_unmap_images(struct intel_context *intel,
-                      struct intel_texture_object *intelObj)
-{
-   GLuint nr_faces = _mesa_num_tex_faces(intelObj->base.Target);
-   int i, face;
-
-   for (i = intelObj->base.BaseLevel; i <= intelObj->_MaxLevel; i++) {
-      for (face = 0; face < nr_faces; face++) {
-        struct intel_texture_image *intel_image =
-           intel_texture_image(intelObj->base.Image[face][i]);
+   intelObj->needs_validate = false;
 
-        intel_tex_unmap_image_for_swrast(intel, intel_image);
-      }
-   }
+   return true;
 }