From 571bf7a71b37576d4ed89f8f540237790865e35e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 17 Mar 2006 20:44:09 +0000 Subject: [PATCH] Change loops from firstLevel to lastLevel to be inclusive of lastLevel (i.e. change < to <=). Otherwise, 0th image of non-mipmapped textures wasn't getting mapped and software rendering died. --- src/mesa/drivers/dri/i915/intel_tex_validate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_tex_validate.c b/src/mesa/drivers/dri/i915/intel_tex_validate.c index 3bfc659409a..72f5afb13e5 100644 --- a/src/mesa/drivers/dri/i915/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i915/intel_tex_validate.c @@ -177,7 +177,7 @@ GLuint intel_finalize_mipmap_tree( struct intel_context *intel, GLuint unit ) */ nr_faces = (intelObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1; for (face = 0; face < nr_faces; face++) { - for (i = intelObj->firstLevel; i < intelObj->lastLevel; i++) { + for (i = intelObj->firstLevel; i <= intelObj->lastLevel; i++) { struct intel_texture_image *intelImage = intel_texture_image(intelObj->base.Image[face][i]); @@ -205,7 +205,7 @@ void intel_tex_map_images( struct intel_context *intel, DBG("%s\n", __FUNCTION__); for (face = 0; face < nr_faces; face++) { - for (i = intelObj->firstLevel; i < intelObj->lastLevel; i++) { + for (i = intelObj->firstLevel; i <= intelObj->lastLevel; i++) { struct intel_texture_image *intelImage = intel_texture_image(intelObj->base.Image[face][i]); @@ -234,7 +234,7 @@ void intel_tex_unmap_images( struct intel_context *intel, GLuint face, i; for (face = 0; face < nr_faces; face++) { - for (i = intelObj->firstLevel; i < intelObj->lastLevel; i++) { + for (i = intelObj->firstLevel; i <= intelObj->lastLevel; i++) { struct intel_texture_image *intelImage = intel_texture_image(intelObj->base.Image[face][i]);