X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fintel_tex_validate.c;h=37aa8f43ec9ae59c1b05acccb5cf9e18288decd9;hb=eb3047c094abfa03e071453d7c373e9c2c574370;hp=16354d2b6729269c7b4887acd9088c553cd5001c;hpb=24a0da338f47ac2e8fd2a7845b87045439250e75;p=mesa.git

diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c
index 16354d2b672..37aa8f43ec9 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c
@@ -29,7 +29,6 @@
 
 #include "brw_context.h"
 #include "intel_mipmap_tree.h"
-#include "intel_blit.h"
 #include "intel_tex.h"
 
 #define FILE_DEBUG_FLAG DEBUG_TEXTURE
@@ -43,10 +42,10 @@
  * allow sampling beyond level 0.
  */
 static void
-intel_update_max_level(struct intel_texture_object *intelObj,
+intel_update_max_level(struct gl_texture_object *tObj,
 		       struct gl_sampler_object *sampler)
 {
-   struct gl_texture_object *tObj = &intelObj->base;
+   struct intel_texture_object *intelObj = intel_texture_object(tObj);
 
    if (!tObj->_MipmapComplete ||
        (tObj->_RenderToTexture &&
@@ -65,12 +64,10 @@ intel_update_max_level(struct intel_texture_object *intelObj,
  * stored in other miptrees.
  */
 void
-intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
+intel_finalize_mipmap_tree(struct brw_context *brw,
+                           struct gl_texture_object *tObj)
 {
-   struct gl_context *ctx = &brw->ctx;
-   struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current;
    struct intel_texture_object *intelObj = intel_texture_object(tObj);
-   struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
    GLuint face, i;
    GLuint nr_faces = 0;
    struct intel_texture_image *firstImage;
@@ -80,13 +77,6 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
    if (tObj->Target == GL_TEXTURE_BUFFER)
       return;
 
-   /* We know that this is true by now, and if it wasn't, we might have
-    * mismatched level sizes and the copies would fail.
-    */
-   assert(intelObj->base._BaseComplete);
-
-   intel_update_max_level(intelObj, sampler);
-
    /* What levels does this validated texture image require? */
    int validate_first_level = tObj->BaseLevel;
    int validate_last_level = intelObj->_MaxLevel;
@@ -111,7 +101,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
     *
     * FINISHME: Avoid doing this.
     */
-   assert(!tObj->Immutable || brw->gen < 6);
+   assert(!tObj->Immutable || brw->screen->devinfo.gen < 6);
 
    firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]);
 
@@ -129,8 +119,32 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
    /* May need to create a new tree:
     */
    if (!intelObj->mt) {
+      const unsigned level = firstImage->base.Base.Level;
       intel_get_image_dims(&firstImage->base.Base, &width, &height, &depth);
-
+      /* Figure out image dimensions at start level. */
+      switch(intelObj->base.Target) {
+      case GL_TEXTURE_2D_MULTISAMPLE:
+      case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+      case GL_TEXTURE_RECTANGLE:
+      case GL_TEXTURE_EXTERNAL_OES:
+          assert(level == 0);
+          break;
+      case GL_TEXTURE_3D:
+          depth = depth << level;
+          /* Fall through */
+      case GL_TEXTURE_2D:
+      case GL_TEXTURE_2D_ARRAY:
+      case GL_TEXTURE_CUBE_MAP:
+      case GL_TEXTURE_CUBE_MAP_ARRAY:
+          height = height << level;
+          /* Fall through */
+      case GL_TEXTURE_1D:
+      case GL_TEXTURE_1D_ARRAY:
+          width = width << level;
+          break;
+      default:
+          unreachable("Unexpected target");
+      }
       perf_debug("Creating new %s %dx%dx%d %d-level miptree to handle "
                  "finalized texture miptree.\n",
                  _mesa_get_format_name(firstImage->base.Base.TexFormat),
@@ -161,10 +175,8 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
  	 if (intelImage == NULL)
 		 break;
 
-         if (intelObj->mt != intelImage->mt) {
-            intel_miptree_copy_teximage(brw, intelImage, intelObj->mt,
-                                        false /* invalidate */);
-         }
+         if (intelObj->mt != intelImage->mt)
+            intel_miptree_copy_teximage(brw, intelImage, intelObj->mt);
 
          /* After we're done, we'd better agree that our layout is
           * appropriate, or we'll end up hitting this function again on the
@@ -176,7 +188,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
 
    intelObj->validated_first_level = validate_first_level;
    intelObj->validated_last_level = validate_last_level;
-   intelObj->_Format = intelObj->mt->format;
+   intelObj->_Format = firstImage->base.Base.TexFormat,
    intelObj->needs_validate = false;
 }
 
@@ -191,10 +203,19 @@ brw_validate_textures(struct brw_context *brw)
    const int max_enabled_unit = ctx->Texture._MaxEnabledTexImageUnit;
 
    for (int unit = 0; unit <= max_enabled_unit; unit++) {
-      struct gl_texture_unit *tex_unit = &ctx->Texture.Unit[unit];
+      struct gl_texture_object *tex_obj = ctx->Texture.Unit[unit]._Current;
 
-      if (tex_unit->_Current) {
-         intel_finalize_mipmap_tree(brw, unit);
-      }
+      if (!tex_obj)
+         continue;
+
+      struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
+
+      /* We know that this is true by now, and if it wasn't, we might have
+       * mismatched level sizes and the copies would fail.
+       */
+      assert(tex_obj->_BaseComplete);
+
+      intel_update_max_level(tex_obj, sampler);
+      intel_finalize_mipmap_tree(brw, tex_obj);
    }
 }