Mesa (master): dri/nouveau: Don't try to map a non-existent teximage.
Francisco Jerez
currojerez at kemper.freedesktop.org
Thu Feb 25 18:33:38 UTC 2010
Module: Mesa
Branch: master
Commit: 7432ffbdfa52b51b720bdde5cd50c497862b8806
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7432ffbdfa52b51b720bdde5cd50c497862b8806
Author: Francisco Jerez <currojerez at riseup.net>
Date: Tue Feb 23 16:31:42 2010 +0100
dri/nouveau: Don't try to map a non-existent teximage.
---
src/mesa/drivers/dri/nouveau/nouveau_texture.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
index 32603ab..5b78804 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
@@ -81,10 +81,12 @@ nouveau_teximage_map(GLcontext *ctx, struct gl_texture_image *ti)
struct nouveau_surface *s = &to_nouveau_teximage(ti)->surface;
int ret;
- ret = nouveau_bo_map(s->bo, NOUVEAU_BO_RDWR);
- assert(!ret);
+ if (s->bo) {
+ ret = nouveau_bo_map(s->bo, NOUVEAU_BO_RDWR);
+ assert(!ret);
- ti->Data = s->bo->map;
+ ti->Data = s->bo->map;
+ }
}
static void
@@ -92,7 +94,8 @@ nouveau_teximage_unmap(GLcontext *ctx, struct gl_texture_image *ti)
{
struct nouveau_surface *s = &to_nouveau_teximage(ti)->surface;
- nouveau_bo_unmap(s->bo);
+ if (s->bo)
+ nouveau_bo_unmap(s->bo);
ti->Data = NULL;
}
More information about the mesa-commit
mailing list