From 5438e39fae4faaae522cdec3edfd34c0478464e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 2 Apr 2017 16:22:54 +0200 Subject: [PATCH] radeonsi: don't allow user indices with indirect draws MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Not possible with GL and it will make future gallium rework easier. (also it's something I wouldn't like to support) Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_state_draw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 0ada60afac9..9b7b52c3597 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -1220,13 +1220,13 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) ib_tmp.index_size = 2; ib = &ib_tmp; } else if (ib->user_buffer && !ib->buffer) { - unsigned start, count, start_offset; + unsigned start_offset; - si_get_draw_start_count(sctx, info, &start, &count); - start_offset = start * ib->index_size; + assert(!info->indirect); + start_offset = info->start * ib->index_size; u_upload_data(ctx->stream_uploader, start_offset, - count * ib->index_size, + info->count * ib->index_size, sctx->screen->b.info.tcc_cache_line_size, (char*)ib->user_buffer + start_offset, &ib_tmp.offset, &ib_tmp.buffer); -- 2.30.2