From d9b9b4b3beafa824914ca460754bf0a9d7ee80b6 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 8 Sep 2005 18:47:36 +0000 Subject: [PATCH] Fix the comment for the 'bound' field: it's a bitmask, not an index. In driTexturesGone(), set bound = 0, not 99. --- src/mesa/drivers/dri/common/texmem.c | 2 +- src/mesa/drivers/dri/common/texmem.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c index acefce0f597..5bc27e44936 100644 --- 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 705cd4d3445..486cb0dab94 100644 --- 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 -- 2.30.2