From: Felix Kuehling <fxkuehl@gmx.de>
Date: Mon, 8 Mar 2004 00:34:43 +0000 (+0000)
Subject: Swapout textures who's space is claimed by a new texture. Don't destroy.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=446d8d0b86d05089c56d53e9887cdf03574a1441;p=mesa.git

Swapout textures who's space is claimed by a new texture. Don't destroy.
This finally really fixes assertion failures in savageBindTexture.
I think the same situation with several contexts is still broken though.
---

diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c
index 45d347b0bee..0ce2a964652 100644
--- a/src/mesa/drivers/dri/savage/savagetex.c
+++ b/src/mesa/drivers/dri/savage/savagetex.c
@@ -800,7 +800,7 @@ int savageUploadTexImages( savageContextPtr imesa, savageTextureObjectPtr t )
 	    return -1;
 	 }
 	 
-	 savageDestroyTexObj( imesa, imesa->TexObjList[heap].prev );
+	 savageSwapOutTexObj( imesa, imesa->TexObjList[heap].prev );
       }
  
       ofs = t->MemBlock->ofs;