From 5cf568ce09347b7423f8bea0fa14cd2b2cfaa60b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 1 Oct 2021 14:56:32 -0400 Subject: [PATCH] lavapipe: remove lvp_subpass_attachment::layout unused Reviewed-by: Dave Airlie Part-of: --- src/gallium/frontends/lavapipe/lvp_pass.c | 5 ----- src/gallium/frontends/lavapipe/lvp_private.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_pass.c b/src/gallium/frontends/lavapipe/lvp_pass.c index 3d0e454..d58a472 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 ace74b7..be886c7 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 { -- 2.7.4