| commit | 506f5d9bda64fc07ee1a216cb3aeef98491c6365 | [log] [tgz] |
|---|---|---|
| author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | Mon May 11 09:18:49 2020 +0200 |
| committer | Marge Bot <eric+marge@anholt.net> | Mon May 11 08:15:15 2020 +0000 |
| tree | 810acb141b4c77f75529c44a3724e51efec9bc9d | |
| parent | 266978f7cabe2c09e5538ef1b79efdd96b2cba00 [diff] |
ac/surface: remove shadowing declaration
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>
diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 98f1276..1c2c0d8 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c
@@ -2000,8 +2000,8 @@ 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)); }