From: Thomas Hellström <thomas@tungstengraphics.com>
Date: Wed, 15 Dec 2004 21:05:26 +0000 (+0000)
Subject: Unichrome DRI driver:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a47c4c37ce7ca45974b10f2bbb49bc88fad64a54;p=mesa.git

Unichrome DRI driver:
Check for texture allocation failure (Bugzilla #1633, Bartlomiej Krol)
Reenabled AGP textures (Thomas Hellström)
---

diff --git a/src/mesa/drivers/dri/unichrome/via_texmem.c b/src/mesa/drivers/dri/unichrome/via_texmem.c
index f1f6b750ddd..2d8aecab4eb 100644
--- a/src/mesa/drivers/dri/unichrome/via_texmem.c
+++ b/src/mesa/drivers/dri/unichrome/via_texmem.c
@@ -441,14 +441,12 @@ void viaUploadTexImages(viaContextPtr vmesa, viaTextureObjectPtr t)
         while (1) {
 
     	    /*=* John Sheng [2003.5.31]  agp tex *=*/
-	    via_alloc_texture(vmesa, t);
-	    /*via_alloc_texture_agp(vmesa, t);*/
-
-	    if (t->texMem.offset)
-                break;
-	    else
-		agpFullCount++;
+	    if (via_alloc_texture_agp(vmesa, t))
+		break;
+	    if (via_alloc_texture(vmesa, t))
+		break;
 
+	    agpFullCount++; 
             if (vmesa->TexObjList.prev == vmesa->CurrentTexObj[0] ||
                 vmesa->TexObjList.prev == vmesa->CurrentTexObj[1]) {
 #ifdef DEBUG