From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 29 Mar 2023 15:02:15 +0000 (-0500)
Subject: vulkan: Drop vk_render_pass_state::*self_dependenc*
X-Git-Tag: upstream/23.3.3~10577
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4c18b9b769a65fb282a86b3772bab65b8061344;p=platform%2Fupstream%2Fmesa.git

vulkan: Drop vk_render_pass_state::*self_dependenc*

ANV was the only driver using them and now it's on feedback loop flags.
Other drivers should convert instead of depending on the old version.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22191>
---

diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c
index 4531c6a..444cb17 100644
--- a/src/vulkan/runtime/vk_graphics_state.c
+++ b/src/vulkan/runtime/vk_graphics_state.c
@@ -1060,16 +1060,6 @@ vk_render_pass_state_init(struct vk_render_pass_state *rp,
    if (r_info->stencilAttachmentFormat != VK_FORMAT_UNDEFINED)
       rp->attachment_aspects |= VK_IMAGE_ASPECT_STENCIL_BIT;
 
-   const VkRenderingSelfDependencyInfoMESA *rsd_info =
-      vk_find_struct_const(r_info->pNext, RENDERING_SELF_DEPENDENCY_INFO_MESA);
-   if (rsd_info != NULL) {
-      STATIC_ASSERT(sizeof(rp->color_self_dependencies) * 8 >=
-                    MESA_VK_MAX_COLOR_ATTACHMENTS);
-      rp->color_self_dependencies = rsd_info->colorSelfDependencies;
-      rp->depth_self_dependency = rsd_info->depthSelfDependency;
-      rp->stencil_self_dependency = rsd_info->stencilSelfDependency;
-   }
-
    const VkAttachmentSampleCountInfoAMD *asc_info =
       vk_get_pipeline_sample_count_info_amd(info);
    if (asc_info != NULL) {
diff --git a/src/vulkan/runtime/vk_graphics_state.h b/src/vulkan/runtime/vk_graphics_state.h
index 8bae9fb..ac660d5 100644
--- a/src/vulkan/runtime/vk_graphics_state.h
+++ b/src/vulkan/runtime/vk_graphics_state.h
@@ -657,15 +657,6 @@ struct vk_render_pass_state {
     */
    VkPipelineCreateFlags pipeline_flags;
 
-   /** VkRenderingSelfDependencyInfoMESA::colorSelfDependencies */
-   uint8_t color_self_dependencies;
-
-   /** VkRenderingSelfDependencyInfoMESA::depthSelfDependency */
-   bool depth_self_dependency;
-
-   /** VkRenderingSelfDependencyInfoMESA::stencilSelfDependency */
-   bool stencil_self_dependency;
-
    /** VkPipelineRenderingCreateInfo::colorAttachmentCount */
    uint8_t color_attachment_count;