diff options
| author | LC <mathew1800@gmail.com> | 2020-12-07 00:06:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 00:06:53 -0500 |
| commit | 69af6ada2f3fa7657964c6f6a95fbe24f9c1aa41 (patch) | |
| tree | 9cc837fa8d085c5c483fd84239925870e44ba478 /src/video_core/texture_cache/surface_view.h | |
| parent | 5933667cb83b690d029b9d5b646dc93f1ef4fda8 (diff) | |
| parent | f95602f15207851b849c57e2a2dd313a087b2493 (diff) | |
Merge pull request #5136 from lioncash/video-shadow3
video_core: Resolve more variable shadowing scenarios pt.3
Diffstat (limited to 'src/video_core/texture_cache/surface_view.h')
| -rw-r--r-- | src/video_core/texture_cache/surface_view.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/texture_cache/surface_view.h b/src/video_core/texture_cache/surface_view.h index 90a8bb0ae..199f72732 100644 --- a/src/video_core/texture_cache/surface_view.h +++ b/src/video_core/texture_cache/surface_view.h @@ -13,10 +13,10 @@ namespace VideoCommon { struct ViewParams { - constexpr explicit ViewParams(VideoCore::Surface::SurfaceTarget target, u32 base_layer, - u32 num_layers, u32 base_level, u32 num_levels) - : target{target}, base_layer{base_layer}, num_layers{num_layers}, base_level{base_level}, - num_levels{num_levels} {} + constexpr explicit ViewParams(VideoCore::Surface::SurfaceTarget target_, u32 base_layer_, + u32 num_layers_, u32 base_level_, u32 num_levels_) + : target{target_}, base_layer{base_layer_}, num_layers{num_layers_}, + base_level{base_level_}, num_levels{num_levels_} {} std::size_t Hash() const; @@ -44,7 +44,7 @@ struct ViewParams { class ViewBase { public: - constexpr explicit ViewBase(const ViewParams& params) : params{params} {} + constexpr explicit ViewBase(const ViewParams& view_params) : params{view_params} {} constexpr const ViewParams& GetViewParams() const { return params; |
