From a264fee6245856340fab9024e1a428626e966335 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 15 Feb 2017 17:24:38 +0100 Subject: [PATCH] radeonsi: fix UNSIGNED_BYTE index buffer fallback with non-zero start (v2) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/gallium/drivers/radeonsi/si_state_draw.c | 4 ++-- 1 file 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 34a44cc31fd..c463fef835c 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -1052,7 +1052,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; size = count * 2; u_upload_alloc(ctx->stream_uploader, start_offset, @@ -1065,7 +1065,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); -- 2.30.2