diff options
| author | Chloe <25727384+ogniK5377@users.noreply.github.com> | 2020-12-05 23:45:00 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 23:45:00 +1100 |
| commit | fe9823a520f9be2caacbdfc9c97a985bf5cd109e (patch) | |
| tree | 6eac8e13f3333c89d8c0f3428b8664cab63a484a /src/video_core/texture_cache/surface_base.h | |
| parent | 32984bf3e154e9d1d9b0acf1293a3ebee3560b0c (diff) | |
| parent | 341083a5e135edb06bcb8913f4897c232650d1da (diff) | |
Merge pull request #5133 from lioncash/video-shadow2
video_core: Resolve more variable shadowing scenarios pt.2
Diffstat (limited to 'src/video_core/texture_cache/surface_base.h')
| -rw-r--r-- | src/video_core/texture_cache/surface_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/texture_cache/surface_base.h b/src/video_core/texture_cache/surface_base.h index 173f2edba0..cfcfa5b3a7 100644 --- a/src/video_core/texture_cache/surface_base.h +++ b/src/video_core/texture_cache/surface_base.h @@ -167,8 +167,8 @@ protected: std::vector<std::size_t> mipmap_offsets; private: - void SwizzleFunc(MortonSwizzleMode mode, u8* memory, const SurfaceParams& params, u8* buffer, - u32 level); + void SwizzleFunc(MortonSwizzleMode mode, u8* memory, const SurfaceParams& surface_params, + u8* buffer, u32 level); std::vector<CopyParams> BreakDownLayered(const SurfaceParams& in_params) const; |