diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2017-02-15 17:24:38 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-03-01 13:34:40 +0000 |
| commit | 9c80a8133f8e75d95bad54bae92402fa7a7252e0 (patch) | |
| tree | bb6eb40074ec73af3b5d045a9e5a0b2334e81b2b | |
| parent | e1ba82d559a23e0653dda4186c3242c359a03eb2 (diff) | |
radeonsi: fix UNSIGNED_BYTE index buffer fallback with non-zero start (v2)
start can only be non-zero with MultiDrawElements, which is unlikely
to occur with UNSIGNED_BYTE indices.
v2: Also fix the util_shorten_ubyte_elts_to_userptr call.
Tested with the new piglit.
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit a264fee6245856340fab9024e1a428626e966335)
[Emil Velikov: resolve trivial conflicts]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Conflicts:
src/gallium/drivers/radeonsi/si_state_draw.c
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index d296874a23b..4bd087c8965 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -1060,7 +1060,7 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) void *ptr; si_get_draw_start_count(sctx, info, &start, &count); - start_offset = start * ib.index_size; + start_offset = start * 2; u_upload_alloc(sctx->b.uploader, start_offset, count * 2, 256, &out_offset, &out_buffer, &ptr); @@ -1070,7 +1070,7 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) } util_shorten_ubyte_elts_to_userptr(&sctx->b.b, &ib, 0, - ib.offset + start_offset, + ib.offset + start, count, ptr); pipe_resource_reference(&ib.buffer, NULL); |