[Mesa-dev] [PATCH 03/21] gallium/util: use cso_draw_arrays in util_draw_vertex_buffer

[Marek Olšák]

---
 src/gallium/auxiliary/util/u_draw_quad.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_draw_quad.c b/src/gallium/auxiliary/util/u_draw_quad.c
index 8ed3b3c..590fa0c 100644
--- a/src/gallium/auxiliary/util/u_draw_quad.c
+++ b/src/gallium/auxiliary/util/u_draw_quad.c
@@ -57,16 +57,15 @@ util_draw_vertex_buffer(struct pipe_context *pipe,
    vbuffer.stride = num_attribs * 4 * sizeof(float);  /* vertex size */
    vbuffer.buffer_offset = offset;
 
+   /* note: vertex elements already set by caller */
+
    if (cso) {
       cso_set_vertex_buffers(cso, 1, &vbuffer);
+      cso_draw_arrays(cso, prim_type, 0, num_verts);
    } else {
       pipe->set_vertex_buffers(pipe, 1, &vbuffer);
+      util_draw_arrays(pipe, prim_type, 0, num_verts);
    }
-
-   /* note: vertex elements already set by caller */
-
-   /* draw */
-   util_draw_arrays(pipe, prim_type, 0, num_verts);
 }
 
 
-- 
1.7.5.4