Consolidate texObj->Pos/Neg/X/Y/Z and texObj->Image into a single

array, texObj->Image[face][level].

2 files changed, 8 insertions, 7 deletions

diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c
index 53e87b9593..a40d33f1e9 100644
--- a/src/mesa/drivers/dri/common/texmem.c
+++ b/src/mesa/drivers/dri/common/texmem.c
@@ -1183,7 +1183,7 @@ driCalculateTextureFirstLastLevel( driTextureObject * t )
 {
    struct gl_texture_object * const tObj = t->tObj;
    const struct gl_texture_image * const baseImage =
-       tObj->Image[tObj->BaseLevel];
+       tObj->Image[0][tObj->BaseLevel];
 
    /* These must be signed values.  MinLod and MaxLod can be negative numbers,
     * and having firstLevel and lastLevel as signed prevents the need for
diff --git a/src/mesa/drivers/dri/common/texmem.h b/src/mesa/drivers/dri/common/texmem.h
index 9afbb0c865..f0c416fc61 100644
--- a/src/mesa/drivers/dri/common/texmem.h
+++ b/src/mesa/drivers/dri/common/texmem.h
@@ -89,16 +89,17 @@ struct dri_texture_object {
 					 * the framebuffer.  
 					 */
 
-        unsigned    firstLevel;         /**< Image in \c tObj->Image that
+        unsigned    firstLevel;         /**< Image in \c tObj->Image[0] that
 					 * corresponds to the base-level of
 					 * this texture object.
 					 */
 
-        unsigned    lastLevel;          /**< Last image in \c tObj->Image used
-					 * by the current LOD settings of this
-					 * texture object.  This value must be
-					 * greater than or equal to
-					 * \c firstLevel.
+        unsigned    lastLevel;          /**< Last image in \c tObj->Image[0] 
+					 * used by the
+					 * current LOD settings of
+					 * this texture object.  This
+					 * value must be greater than
+					 * or equal to \c firstLevel.
 					 */
 };