dri/nouveau: allow multiple maps of surface buffers

Can happen during swrast fallbacks if a buffer is somehow bound as
a render target and a texture.

Fixes gnome-shell on nv20, and gets it mostly working on nv10.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2011-01-19 15:51:57 +10:00
parent f7bab47e6c
commit c73a1c18b2
@@ -113,8 +113,10 @@ nouveau_teximage_map(struct gl_context *ctx, struct gl_texture_image *ti,
if (access & GL_MAP_WRITE_BIT)
flags |= NOUVEAU_BO_WR;
ret = nouveau_bo_map(s->bo, flags);
assert(!ret);
if (!s->bo->map) {
ret = nouveau_bo_map(s->bo, flags);
assert(!ret);
}
ti->Data = s->bo->map + y * s->pitch + x * s->cpp;
}