From efaf906415f1cc9cf123cd89dd346c35d327d26b Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Mon, 25 May 2015 20:15:09 -0400 Subject: nv30/draw: fix indexed draws with swtnl path and a resource index buffer The map = assignment was missing. Signed-off-by: Ilia Mirkin Cc: "10.5 10.6" (cherry picked from commit 3600439897c79d37c3c654546867ddfa0c420743) --- src/gallium/drivers/nouveau/nv30/nv30_draw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/nouveau/nv30/nv30_draw.c b/src/gallium/drivers/nouveau/nv30/nv30_draw.c index 783ffe80ead..de8cde212fb 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_draw.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_draw.c @@ -419,9 +419,9 @@ nv30_render_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) if (info->indexed) { const void *map = nv30->idxbuf.user_buffer; if (!map) - pipe_buffer_map(pipe, nv30->idxbuf.buffer, - PIPE_TRANSFER_UNSYNCHRONIZED | - PIPE_TRANSFER_READ, &transferi); + map = pipe_buffer_map(pipe, nv30->idxbuf.buffer, + PIPE_TRANSFER_UNSYNCHRONIZED | + PIPE_TRANSFER_READ, &transferi); draw_set_indexes(draw, (ubyte *) map + nv30->idxbuf.offset, nv30->idxbuf.index_size, ~0); -- cgit v1.2.3