Fix the comment for the 'bound' field: it's a bitmask, not an index.

In driTexturesGone(), set bound = 0, not 99.

diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c
index acefce0..5bc27e4 100644 (file)
--- a/src/mesa/drivers/dri/common/texmem.c
+++ b/src/mesa/drivers/dri/common/texmem.c
@@ -414,7 +414,7 @@ static void driTexturesGone( driTexHeap * heap, int offset, int size,
       }
       t->heap = heap;
       if (in_use) 
-        t->bound = 99;
+        t->bound = 0; /* bound to no tex units */
       insert_at_head( & heap->texture_objects, t );
    }
 }

diff --git a/src/mesa/drivers/dri/common/texmem.h b/src/mesa/drivers/dri/common/texmem.h
index 705cd4d..486cb0d 100644 (file)
--- a/src/mesa/drivers/dri/common/texmem.h
+++ b/src/mesa/drivers/dri/common/texmem.h
@@ -67,7 +67,10 @@ struct dri_texture_object {
                                         * A placeholder should have a heap and a memBlock.
                                         */
        PMemBlock   memBlock;           /**< Memory block containing texture */
-       unsigned    bound;              /**< Texture unit currently bound to */
+       unsigned    bound;              /**< Bitmask indicating which tex units
+                                        * this texture object is bound to.
+                                        * Bit 0 = unit 0, Bit 1 = unit 1, etc
+                                        */
 
        unsigned    totalSize;          /**< Total size of the texture,
                                         * including all mipmap levels