diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c
index 620e41de768..2ca8dfced50 100644
--- a/src/vulkan/runtime/vk_graphics_state.c
+++ b/src/vulkan/runtime/vk_graphics_state.c
@@ -896,13 +896,13 @@ vk_render_pass_state_init(struct vk_render_pass_state *rp,
    }
 
    *rp = (struct vk_render_pass_state) {
+      .render_pass = info->renderPass,
+      .subpass = info->subpass,
       .depth_attachment_format = VK_FORMAT_UNDEFINED,
       .stencil_attachment_format = VK_FORMAT_UNDEFINED,
    };
 
    if (info->renderPass != VK_NULL_HANDLE && sp_info != NULL) {
-      rp->render_pass = info->renderPass;
-      rp->subpass = info->subpass;
       rp->attachment_aspects = sp_info->attachment_aspects;
       rp->view_mask = sp_info->view_mask;
       return;