From 82691574b6fc5a66290cbab88010caa8bc00c1dd Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 29 Sep 2011 14:54:23 -0700 Subject: [PATCH] intel: Add a safety check for mapping 1D texture arrays. So easy to screw up with the crazy way GL manages them. --- src/mesa/drivers/dri/intel/intel_tex.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c index 4ab618a..83ba50e 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 -- 2.7.4