summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2004-09-25 06:12:40 +0000
committerEric Anholt <anholt@FreeBSD.org>2004-09-25 06:12:40 +0000
commit4010481ba3bce98d95a20e9a061fb62922bdcb83 (patch)
tree489e432fc4cdd8e5875b771c4b3282f3f4ea0c55
parentb4e2e9c65a8c840031065812d3c16add9d61b98b (diff)
Fix texturing in quake3. Some code was left over from the dirty/clean list
setup that now removed atoms from the atomlist on texture deletion.
-rw-r--r--src/mesa/drivers/dri/r200/r200_context.c2
-rw-r--r--src/mesa/drivers/dri/r200/r200_texmem.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 0d3e1bb44e..3b8394f794 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -62,7 +62,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r200_vtxfmt.h"
#include "r200_maos.h"
-#define DRIVER_DATE "20040923"
+#define DRIVER_DATE "20040924"
#include "vblank.h"
#include "utils.h"
diff --git a/src/mesa/drivers/dri/r200/r200_texmem.c b/src/mesa/drivers/dri/r200/r200_texmem.c
index 05ef16e7be..b219995c3e 100644
--- a/src/mesa/drivers/dri/r200/r200_texmem.c
+++ b/src/mesa/drivers/dri/r200/r200_texmem.c
@@ -43,7 +43,6 @@ SOFTWARE.
#include "context.h"
#include "colormac.h"
#include "macros.h"
-#include "simple_list.h"
#include "radeon_reg.h" /* gets definition for usleep */
#include "r200_context.h"
#include "r200_state.h"
@@ -73,10 +72,8 @@ r200DestroyTexObj( r200ContextPtr rmesa, r200TexObjPtr t )
for ( i = 0 ; i < rmesa->glCtx->Const.MaxTextureUnits ; i++ ) {
if ( t == rmesa->state.texture.unit[i].texobj ) {
rmesa->state.texture.unit[i].texobj = NULL;
- remove_from_list( &rmesa->hw.tex[i] );
- make_empty_list( &rmesa->hw.tex[i] );
- remove_from_list( &rmesa->hw.cube[i] );
- make_empty_list( &rmesa->hw.cube[i] );
+ rmesa->hw.tex[i].dirty = GL_FALSE;
+ rmesa->hw.cube[i].dirty = GL_FALSE;
}
}
}