From: Eric Anholt <eric@anholt.net>
Date: Tue, 18 Dec 2012 19:55:16 +0000 (-0800)
Subject: i965: Assert that relayout laid out something that won't need it again.
X-Git-Tag: android-x86-4.4-r1~2181
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e454b2d480c4ef875cd0800b12a0b4cd37821cb5;p=android-x86%2Fexternal-mesa.git

i965: Assert that relayout laid out something that won't need it again.

The ETC1 changes failed at this, so let's make sure it will be caught in
testing next time.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c
index 2f1b3542535..3f21601a8a9 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c
@@ -113,6 +113,12 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit)
          if (intelObj->mt != intelImage->mt) {
             intel_miptree_copy_teximage(intel, 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
+          * next draw
+          */
+         assert(intel_miptree_match_image(intelObj->mt, &intelImage->base.Base));
       }
    }