1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_surface.c b/src/gallium/drivers/softpipe/sp_surface.c
index e0a4841edb0..d25247a5e1d 100644
--- a/src/gallium/drivers/softpipe/sp_surface.c
+++ b/src/gallium/drivers/softpipe/sp_surface.c
@@ -47,7 +47,7 @@ static void sp_blit(struct pipe_context *pipe,
       return;
    }
 
-   if (util_try_blit_via_copy_region(pipe, info)) {
+   if (util_try_blit_via_copy_region(pipe, info, sp->render_cond_query != NULL)) {
       return; /* done */
    }
 
@@ -60,7 +60,8 @@ static void sp_blit(struct pipe_context *pipe,
 
    /* XXX turn off occlusion and streamout queries */
 
-   util_blitter_save_vertex_buffer_slot(sp->blitter, sp->vertex_buffer);
+   util_blitter_save_vertex_buffers(sp->blitter, sp->vertex_buffer,
+                                    sp->num_vertex_buffers);
    util_blitter_save_vertex_elements(sp->blitter, sp->velems);
    util_blitter_save_vertex_shader(sp->blitter, sp->vs);
    util_blitter_save_geometry_shader(sp->blitter, sp->gs);