From a47c4c37ce7ca45974b10f2bbb49bc88fad64a54 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Hellstr=C3=B6m?= Date: Wed, 15 Dec 2004 21:05:26 +0000 Subject: [PATCH] =?utf8?q?Unichrome=20DRI=20driver:=20Check=20for=20textur?= =?utf8?q?e=20allocation=20failure=20(Bugzilla=20#1633,=20Bartlomiej=20Kro?= =?utf8?q?l)=20Reenabled=20AGP=20textures=20(Thomas=20Hellstr=F6m)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/mesa/drivers/dri/unichrome/via_texmem.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 -- 2.30.2