diff options
| author | Thomas Hellström <thomas@tungstengraphics.com> | 2004-12-15 21:05:26 +0000 |
|---|---|---|
| committer | Thomas Hellström <thomas@tungstengraphics.com> | 2004-12-15 21:05:26 +0000 |
| commit | a47c4c37ce7ca45974b10f2bbb49bc88fad64a54 (patch) | |
| tree | df088fcdf3ab91bd4b8f230e16dd8694c9d9809e /src/mesa | |
| parent | 58f5b91b1bd3d329f98969c7d6c8434107b3ec6d (diff) | |
Unichrome DRI driver:
Check for texture allocation failure (Bugzilla #1633, Bartlomiej Krol)
Reenabled AGP textures (Thomas Hellström)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/via_texmem.c | 12 |
1 files 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 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 |