<div dir="ltr">This is a v2 version, by the way.<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jun 6, 2013 at 11:56 AM, Arnas Milasevicius <span dir="ltr"><<a href="mailto:giant1gf@gmail.com" target="_blank">giant1gf@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
Because draw_arrays() is only sued in state_tracker's st_draw_feedback.c file, I moved it from draw_pt.c to there and mate it static.<br>
---<br>
 v2: removed draw_arrays_instanced() function and modified draw_arrays()<br>
 src/mesa/state_tracker/st_draw_feedback.c | 26 +++++++-------------------<br>
 1 file changed, 7 insertions(+), 19 deletions(-)<br>
<br>
diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c<br>
index 56e3018..6bc0383 100644<br>
--- a/src/mesa/state_tracker/st_draw_feedback.c<br>
+++ b/src/mesa/state_tracker/st_draw_feedback.c<br>
@@ -86,12 +86,12 @@ set_feedback_vertex_format(struct gl_context *ctx)<br>
  * \sa draw_vbo<br>
  */<br>
 static void<br>
-draw_arrays_instanced(struct draw_context *draw,<br>
-                      unsigned mode,<br>
-                      unsigned start,<br>
-                      unsigned count,<br>
-                      unsigned startInstance,<br>
-                      unsigned instanceCount)<br>
+draw_arrays(struct draw_context *draw,<br>
+                       unsigned mode,<br>
+            unsigned start,<br>
+                       unsigned count,<br>
+                       unsigned startInstance,<br>
+                       unsigned instanceCount)<br>
 {<br>
    struct pipe_draw_info info;<br>
<br>
@@ -110,18 +110,6 @@ draw_arrays_instanced(struct draw_context *draw,<br>
<br>
<br>
 /**<br>
- * Non-instanced drawing.<br>
- * \sa draw_arrays_instanced<br>
- */<br>
-static void<br>
-draw_arrays(struct draw_context *draw, unsigned prim,<br>
-            unsigned start, unsigned count)<br>
-{<br>
-   draw_arrays_instanced(draw, prim, start, count, 0, 1);<br>
-}<br>
-<br>
-<br>
-/**<br>
  * Called by VBO to draw arrays when in selection or feedback mode and<br>
  * to implement glRasterPos.<br>
  * This is very much like the normal draw_vbo() function above.<br>
@@ -285,7 +273,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,<br>
<br>
    /* draw here */<br>
    for (i = 0; i < nr_prims; i++) {<br>
-      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count);<br>
+      draw_arrays(draw, prims[i].mode, prims[i].start, prims[i].count, 0, 1);<br>
    }<br>
<span class="HOEnZb"><font color="#888888"><br>
<br>
--<br>
1.8.3<br>
<br>
</font></span></blockquote></div><br></div>