From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 4 Oct 2017 23:54:30 +0000 (+0200)
Subject: radeonsi: don't use util_draw_arrays_instanced in si_draw_rectangle
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f84a63bc0022ea72c122b96344cd5f88034d9b62;p=mesa.git

radeonsi: don't use util_draw_arrays_instanced in si_draw_rectangle

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 43ad97adcb3..adebba645d4 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -29,7 +29,6 @@
 #include "sid.h"
 #include "gfx9d.h"
 
-#include "util/u_draw.h"
 #include "util/u_index_modify.h"
 #include "util/u_log.h"
 #include "util/u_upload_mgr.h"
@@ -1565,8 +1564,13 @@ void si_draw_rectangle(struct blitter_context *blitter,
 	vbuffer.buffer_offset = offset;
 
 	pipe->set_vertex_buffers(pipe, blitter->vb_slot, 1, &vbuffer);
-	util_draw_arrays_instanced(pipe, R600_PRIM_RECTANGLE_LIST, 0, 3,
-				   0, num_instances);
+
+	struct pipe_draw_info info = {};
+	info.mode = R600_PRIM_RECTANGLE_LIST;
+	info.count = 3;
+	info.instance_count = num_instances;
+
+	si_draw_vbo(pipe, &info);
 	pipe_resource_reference(&buf, NULL);
 }