r300: Use util_draw_multi() helper

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9742>
This commit is contained in:
Rob Clark 2021-03-21 10:04:07 -07:00 committed by Marge Bot
parent e200da1f02
commit 0634abbeb7
1 changed files with 9 additions and 20 deletions

View File

@ -30,6 +30,7 @@
#include "util/u_inlines.h"
#include "util/format/u_format.h"
#include "util/u_draw.h"
#include "util/u_memory.h"
#include "util/u_upload_mgr.h"
#include "util/u_prim.h"
@ -791,16 +792,10 @@ static void r300_draw_vbo(struct pipe_context* pipe,
const struct pipe_draw_start_count *draws,
unsigned num_draws)
{
if (num_draws > 1) {
struct pipe_draw_info tmp_info = *dinfo;
for (unsigned i = 0; i < num_draws; i++) {
r300_draw_vbo(pipe, &tmp_info, indirect, &draws[i], 1);
if (tmp_info.increment_draw_id)
tmp_info.drawid++;
}
return;
}
if (num_draws > 1) {
util_draw_multi(pipe, dinfo, indirect, draws, num_draws);
return;
}
struct r300_context* r300 = r300_context(pipe);
struct pipe_draw_info info = *dinfo;
@ -864,16 +859,10 @@ static void r300_swtcl_draw_vbo(struct pipe_context* pipe,
const struct pipe_draw_start_count *draws,
unsigned num_draws)
{
if (num_draws > 1) {
struct pipe_draw_info tmp_info = *info;
for (unsigned i = 0; i < num_draws; i++) {
r300_swtcl_draw_vbo(pipe, &tmp_info, indirect, &draws[i], 1);
if (tmp_info.increment_draw_id)
tmp_info.drawid++;
}
return;
}
if (num_draws > 1) {
util_draw_multi(pipe, info, indirect, draws, num_draws);
return;
}
struct r300_context* r300 = r300_context(pipe);
struct pipe_draw_start_count draw = draws[0];