diff --git a/src/gallium/auxiliary/draw/draw_pipe_vbuf.c b/src/gallium/auxiliary/draw/draw_pipe_vbuf.c
index 8592f51db12..ea180fb13f2 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_vbuf.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_vbuf.c
@@ -191,6 +191,8 @@ vbuf_start_prim(struct vbuf_stage *vbuf, uint prim)
    const struct vertex_info *vinfo;
 
    vbuf->render->set_primitive(vbuf->render, prim);
+   if (vbuf->render->set_view_index)
+      vbuf->render->set_view_index(vbuf->render, vbuf->stage.draw->pt.user.viewid);
 
    /* Must do this after set_primitive() above:
     *
diff --git a/src/gallium/auxiliary/draw/draw_pt_emit.c b/src/gallium/auxiliary/draw/draw_pt_emit.c
index 984c76fdf94..de42241ac30 100644
--- a/src/gallium/auxiliary/draw/draw_pt_emit.c
+++ b/src/gallium/auxiliary/draw/draw_pt_emit.c
@@ -71,6 +71,8 @@ draw_pt_emit_prepare(struct pt_emit *emit,
    emit->prim = prim;
 
    draw->render->set_primitive(draw->render, emit->prim);
+   if (draw->render->set_view_index)
+      draw->render->set_view_index(draw->render, draw->pt.user.viewid);
 
    /* Must do this after set_primitive() above:
     */
@@ -157,6 +159,8 @@ draw_pt_emit(struct pt_emit *emit,
     * between vbuf.c and here...
     */
    render->set_primitive(draw->render, prim_info->prim);
+   if (draw->render->set_view_index)
+      draw->render->set_view_index(draw->render, draw->pt.user.viewid);
 
    assert(vertex_count <= 65535);
    render->allocate_vertices(render,
@@ -229,6 +233,8 @@ draw_pt_emit_linear(struct pt_emit *emit,
     * between vbuf.c and here...
     */
    render->set_primitive(draw->render, prim_info->prim);
+   if (draw->render->set_view_index)
+      draw->render->set_view_index(draw->render, draw->pt.user.viewid);
 
    assert(count <= 65535);
    if (!render->allocate_vertices(render,