summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2015-05-25 20:15:09 -0400
committerEmil Velikov <emil.l.velikov@gmail.com>2015-05-27 11:46:57 +0100
commit407e20d45d09b5e170aced7e78d61914cecca5cd (patch)
treea1799ef8a32ef9c2d4e7aacc9bc36694a41dca34
parent5eef18390d540d679aaeb664fdb2deb7d56e74ae (diff)
downloadmesa-407e20d45d09b5e170aced7e78d61914cecca5cd.tar.gz
nv30/draw: fix indexed draws with swtnl path and a resource index buffer
The map = assignment was missing. Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: "10.5 10.6" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 3600439897c79d37c3c654546867ddfa0c420743)
-rw-r--r--src/gallium/drivers/nouveau/nv30/nv30_draw.c6
1 files 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);