diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c
index 1c0c7efe922..1f1c7cc1645 100644
--- a/src/gallium/frontends/lavapipe/lvp_execute.c
+++ b/src/gallium/frontends/lavapipe/lvp_execute.c
@@ -1547,12 +1547,15 @@ static void handle_next_subpass(struct lvp_cmd_buffer_entry *cmd,
 static void handle_draw(struct lvp_cmd_buffer_entry *cmd,
                         struct rendering_state *state)
 {
+   const struct lvp_subpass *subpass = &state->pass->subpasses[state->subpass];
    state->info.index_size = 0;
    state->info.index.resource = NULL;
    state->draw.start = cmd->u.draw.first_vertex;
    state->draw.count = cmd->u.draw.vertex_count;
    state->info.start_instance = cmd->u.draw.first_instance;
    state->info.instance_count = cmd->u.draw.instance_count;
+   state->info.view_mask = subpass->view_mask;
+
    state->pctx->draw_vbo(state->pctx, &state->info, NULL, &state->draw, 1);
 }
 
@@ -2097,6 +2100,7 @@ static void handle_update_buffer(struct lvp_cmd_buffer_entry *cmd,
 static void handle_draw_indexed(struct lvp_cmd_buffer_entry *cmd,
                                 struct rendering_state *state)
 {
+   const struct lvp_subpass *subpass = &state->pass->subpasses[state->subpass];
    state->info.index_bounds_valid = false;
    state->info.min_index = 0;
    state->info.max_index = ~0;
@@ -2107,6 +2111,7 @@ static void handle_draw_indexed(struct lvp_cmd_buffer_entry *cmd,
    state->info.start_instance = cmd->u.draw_indexed.first_instance;
    state->info.instance_count = cmd->u.draw_indexed.instance_count;
    state->info.index_bias = cmd->u.draw_indexed.vertex_offset;
+   state->info.view_mask = subpass->view_mask;
 
    if (state->info.primitive_restart) {
       if (state->info.index_size == 4)
@@ -2114,13 +2119,13 @@ static void handle_draw_indexed(struct lvp_cmd_buffer_entry *cmd,
       else
          state->info.restart_index = 0xffff;
    }
-
    state->pctx->draw_vbo(state->pctx, &state->info, NULL, &state->draw, 1);
 }
 
 static void handle_draw_indirect(struct lvp_cmd_buffer_entry *cmd,
                                  struct rendering_state *state, bool indexed)
 {
+   const struct lvp_subpass *subpass = &state->pass->subpasses[state->subpass];
    if (indexed) {
       state->info.index_bounds_valid = false;
       state->info.index_size = state->index_size;
@@ -2132,6 +2137,8 @@ static void handle_draw_indirect(struct lvp_cmd_buffer_entry *cmd,
    state->indirect_info.stride = cmd->u.draw_indirect.stride;
    state->indirect_info.draw_count = cmd->u.draw_indirect.draw_count;
    state->indirect_info.buffer = cmd->u.draw_indirect.buffer->bo;
+   state->info.view_mask = subpass->view_mask;
+
    state->pctx->draw_vbo(state->pctx, &state->info, &state->indirect_info, &state->draw, 1);
 }
 
@@ -2560,6 +2567,7 @@ static void handle_resolve_image(struct lvp_cmd_buffer_entry *cmd,
 static void handle_draw_indirect_count(struct lvp_cmd_buffer_entry *cmd,
                                        struct rendering_state *state, bool indexed)
 {
+   const struct lvp_subpass *subpass = &state->pass->subpasses[state->subpass];
    if (indexed) {
       state->info.index_bounds_valid = false;
       state->info.index_size = state->index_size;
@@ -2573,6 +2581,8 @@ static void handle_draw_indirect_count(struct lvp_cmd_buffer_entry *cmd,
    state->indirect_info.buffer = cmd->u.draw_indirect_count.buffer->bo;
    state->indirect_info.indirect_draw_count_offset = cmd->u.draw_indirect_count.count_buffer_offset;
    state->indirect_info.indirect_draw_count = cmd->u.draw_indirect_count.count_buffer->bo;
+   state->info.view_mask = subpass->view_mask;
+
    state->pctx->draw_vbo(state->pctx, &state->info, &state->indirect_info, &state->draw, 1);
 }
 
@@ -2727,6 +2737,7 @@ static void handle_draw_indirect_byte_count(struct lvp_cmd_buffer_entry *cmd,
                                             struct rendering_state *state)
 {
    struct lvp_cmd_draw_indirect_byte_count *dibc = &cmd->u.draw_indirect_byte_count;
+   const struct lvp_subpass *subpass = &state->pass->subpasses[state->subpass];
 
    pipe_buffer_read(state->pctx,
                     dibc->counter_buffer->bo,
@@ -2738,6 +2749,7 @@ static void handle_draw_indirect_byte_count(struct lvp_cmd_buffer_entry *cmd,
    state->info.index_size = 0;
 
    state->draw.count /= cmd->u.draw_indirect_byte_count.vertex_stride;
+   state->info.view_mask = subpass->view_mask;
    state->pctx->draw_vbo(state->pctx, &state->info, &state->indirect_info, &state->draw, 1);
 }