From a47c4c37ce7ca45974b10f2bbb49bc88fad64a54 Mon Sep 17 00:00:00 2001 From: Thomas Hellström Date: Wed, 15 Dec 2004 21:05:26 +0000 Subject: Unichrome DRI driver: Check for texture allocation failure (Bugzilla #1633, Bartlomiej Krol) Reenabled AGP textures (Thomas Hellström) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mesa/drivers/dri/unichrome/via_texmem.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/unichrome/via_texmem.c b/src/mesa/drivers/dri/unichrome/via_texmem.c index f1f6b750dd..2d8aecab4e 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 -- cgit v1.2.3