From: Eric Anholt <eric@anholt.net>
Date: Tue, 15 Jun 2010 19:18:40 +0000 (-0700)
Subject: intel: Finalize the miptree before mapping it for fallbacks.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6dd6830e6f87044b9ede10d324574cfe1f66a751;p=mesa.git

intel: Finalize the miptree before mapping it for fallbacks.

Fixes segfault in mipmap_view.c demo.  Bug #27212.
---

diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c
index c30552c5a79..fb840c1020d 100644
--- a/src/mesa/drivers/dri/intel/intel_span.c
+++ b/src/mesa/drivers/dri/intel/intel_span.c
@@ -257,6 +257,8 @@ intelSpanRenderStart(GLcontext * ctx)
    for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
       if (ctx->Texture.Unit[i]._ReallyEnabled) {
          struct gl_texture_object *texObj = ctx->Texture.Unit[i]._Current;
+
+         intel_finalize_mipmap_tree(intel, i);
          intel_tex_map_images(intel, intel_texture_object(texObj));
       }
    }