diff --git a/src/gallium/frontends/lavapipe/lvp_pass.c b/src/gallium/frontends/lavapipe/lvp_pass.c
index 3d0e454d3fb..d58a47264f4 100644
--- a/src/gallium/frontends/lavapipe/lvp_pass.c
+++ b/src/gallium/frontends/lavapipe/lvp_pass.c
@@ -210,7 +210,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateRenderPass2(
          for (uint32_t j = 0; j < desc->inputAttachmentCount; j++) {
             subpass->input_attachments[j] = (struct lvp_subpass_attachment) {
                .attachment = desc->pInputAttachments[j].attachment,
-               .layout = desc->pInputAttachments[j].layout,
             };
          }
       }
@@ -222,7 +221,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateRenderPass2(
          for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) {
             subpass->color_attachments[j] = (struct lvp_subpass_attachment) {
                .attachment = desc->pColorAttachments[j].attachment,
-               .layout = desc->pColorAttachments[j].layout,
             };
          }
       }
@@ -234,7 +232,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateRenderPass2(
          for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) {
             subpass->resolve_attachments[j] = (struct lvp_subpass_attachment) {
                .attachment = desc->pResolveAttachments[j].attachment,
-               .layout = desc->pResolveAttachments[j].layout,
             };
          }
       }
@@ -244,7 +241,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateRenderPass2(
 
          *subpass->depth_stencil_attachment = (struct lvp_subpass_attachment) {
             .attachment = desc->pDepthStencilAttachment->attachment,
-            .layout = desc->pDepthStencilAttachment->layout,
          };
       }
 
@@ -256,7 +252,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateRenderPass2(
 
          *subpass->ds_resolve_attachment = (struct lvp_subpass_attachment){
             .attachment = ds_resolve->pDepthStencilResolveAttachment->attachment,
-            .layout = ds_resolve->pDepthStencilResolveAttachment->layout,
          };
 
          subpass->depth_resolve_mode = ds_resolve->depthResolveMode;
diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h
index ace74b73e3e..be886c7e3b3 100644
--- a/src/gallium/frontends/lavapipe/lvp_private.h
+++ b/src/gallium/frontends/lavapipe/lvp_private.h
@@ -261,7 +261,6 @@ struct lvp_image_view {
 
 struct lvp_subpass_attachment {
    uint32_t         attachment;
-   VkImageLayout    layout;
 };
 
 struct lvp_subpass {