ac/surface: remove shadowing declaration
authorPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Mon, 11 May 2020 07:18:49 +0000 (09:18 +0200)
committerMarge Bot <eric+marge@anholt.net>
Mon, 11 May 2020 08:15:15 +0000 (08:15 +0000)
Fixes: 7691de0dcef ("ac/surface,radeonsi: move the set/get_bo_metadata code to ac_surface.c")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2929
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4983>

src/amd/common/ac_surface.c

index 98f1276f425a0356c7a16d5c68336280a097b213..1c2c0d8dad286def6ac440272099b7b7ab440df5 100644 (file)
@@ -2000,8 +2000,8 @@ void ac_surface_get_bo_metadata(const struct radeon_info *info,
       uint64_t dcc_offset = 0;
 
       if (surf->dcc_offset) {
-         uint64_t dcc_offset = surf->display_dcc_offset ? surf->display_dcc_offset
-                                                        : surf->dcc_offset;
+         dcc_offset = surf->display_dcc_offset ? surf->display_dcc_offset
+                                               : surf->dcc_offset;
          assert((dcc_offset >> 8) != 0 && (dcc_offset >> 8) < (1 << 24));
       }