Mesa (main): iris: Drop row pitch param from iris_get_ccs_surf

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Dec 11 04:39:16 UTC 2021


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

Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Mon Oct 25 13:39:34 2021 -0700

iris: Drop row pitch param from iris_get_ccs_surf

This parameter won't be used for XeHP, because we can't directly control
the row pitch of the CCS independently from the main surface.

Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13555>

---

 src/gallium/drivers/iris/iris_resource.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
index 1681cc34594..cc10b4198be 100644
--- a/src/gallium/drivers/iris/iris_resource.c
+++ b/src/gallium/drivers/iris/iris_resource.c
@@ -710,8 +710,7 @@ static bool
 iris_get_ccs_surf(const struct isl_device *dev,
                   const struct isl_surf *surf,
                   struct isl_surf *aux_surf,
-                  struct isl_surf *extra_aux_surf,
-                  uint32_t row_pitch_B)
+                  struct isl_surf *extra_aux_surf)
 {
    assert(extra_aux_surf->size_B == 0);
 
@@ -727,8 +726,7 @@ iris_get_ccs_surf(const struct isl_device *dev,
       ccs_surf = aux_surf;
    }
 
-   return isl_surf_get_ccs_surf(dev, surf, hiz_or_mcs_surf,
-                                ccs_surf, row_pitch_B);
+   return isl_surf_get_ccs_surf(dev, surf, hiz_or_mcs_surf, ccs_surf, 0);
 }
 
 /**
@@ -753,7 +751,7 @@ iris_resource_configure_aux(struct iris_screen *screen,
 
    const bool has_ccs = !INTEL_DEBUG(DEBUG_NO_RBC) &&
       iris_get_ccs_surf(&screen->isl_dev, &res->surf, &res->aux.surf,
-                        &res->aux.extra_aux.surf, 0);
+                        &res->aux.extra_aux.surf);
 
    if (has_mcs) {
       assert(!res->mod_info);



More information about the mesa-commit mailing list