From: Eric Anholt <eric@anholt.net>
Date: Thu, 29 Sep 2011 21:54:23 +0000 (-0700)
Subject: intel: Add a safety check for mapping 1D texture arrays.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82691574b6fc5a66290cbab88010caa8bc00c1dd;p=mesa.git

intel: Add a safety check for mapping 1D texture arrays.

So easy to screw up with the crazy way GL manages them.
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c
index 4ab618ad736..83ba50e39ed 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.c
+++ b/src/mesa/drivers/dri/intel/intel_tex.c
@@ -142,6 +142,10 @@ intel_map_texture_image(struct gl_context *ctx,
    struct intel_mipmap_tree *mt = intel_image->mt;
    unsigned int bw, bh;
 
+   /* Check that our caller wasn't confused about how to map a 1D texture. */
+   assert(tex_image->TexObject->Target != GL_TEXTURE_1D_ARRAY ||
+	  h == 1);
+
    if (intel_image->stencil_rb) {
       /*
        * The texture has packed depth/stencil format, but uses separate