Mesa (main): lavapipe: remove lvp_subpass::max_sample_count

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Oct 19 01:31:45 UTC 2021


Module: Mesa
Branch: main
Commit: 5e3bc8b18d8fe95aa175497ae2d4fad19a24c088
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e3bc8b18d8fe95aa175497ae2d4fad19a24c088

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Oct  1 15:21:38 2021 -0400

lavapipe: remove lvp_subpass::max_sample_count

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13349>

---

 src/gallium/frontends/lavapipe/lvp_pass.c    | 17 -----------------
 src/gallium/frontends/lavapipe/lvp_private.h |  2 --
 2 files changed, 19 deletions(-)

diff --git a/src/gallium/frontends/lavapipe/lvp_pass.c b/src/gallium/frontends/lavapipe/lvp_pass.c
index 09a209547c6..19799eb81f3 100644
--- a/src/gallium/frontends/lavapipe/lvp_pass.c
+++ b/src/gallium/frontends/lavapipe/lvp_pass.c
@@ -46,7 +46,6 @@ lvp_render_pass_compile(struct lvp_render_pass *pass)
 
    for (uint32_t i = 0; i < pass->subpass_count; i++) {
       struct lvp_subpass *subpass = &pass->subpasses[i];
-      uint32_t color_sample_count = 1, depth_sample_count = 1;
 
       /* We don't allow depth_stencil_attachment to be non-NULL and
        * be VK_ATTACHMENT_UNUSED.  This way something can just check
@@ -83,24 +82,8 @@ lvp_render_pass_compile(struct lvp_render_pass *pass)
             continue;
 
          subpass->has_color_att = true;
-
-         struct lvp_render_pass_attachment *pass_att =
-            &pass->attachments[subpass_att->attachment];
-
-         color_sample_count = pass_att->samples;
       }
 
-      if (subpass->depth_stencil_attachment) {
-         const uint32_t a =
-            subpass->depth_stencil_attachment->attachment;
-         struct lvp_render_pass_attachment *pass_att =
-            &pass->attachments[a];
-         depth_sample_count = pass_att->samples;
-      }
-
-      subpass->max_sample_count = MAX2(color_sample_count,
-                                       depth_sample_count);
-
       /* We have to handle resolve attachments specially */
       subpass->has_color_resolve = false;
       if (subpass->resolve_attachments) {
diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h
index 7c77b9dfa92..afa5d07a536 100644
--- a/src/gallium/frontends/lavapipe/lvp_private.h
+++ b/src/gallium/frontends/lavapipe/lvp_private.h
@@ -283,8 +283,6 @@ struct lvp_subpass {
    /** Subpass has at least one color attachment */
    bool                                         has_color_att;
 
-   VkSampleCountFlagBits                        max_sample_count;
-
    uint32_t                                     view_mask;
 };
 



More information about the mesa-commit mailing list