diff options
| author | 2020-12-05 00:48:08 -0800 | |
|---|---|---|
| committer | 2020-12-05 00:48:08 -0800 | |
| commit | e6a896c4bdf9cc47c2002c115c9ff280e540fd1b (patch) | |
| tree | e5cd397cb3a11f1529f38ed8fa0a0185d07becaa /src/video_core/command_classes | |
| parent | Merge pull request #5127 from FearlessTobi/port-5617 (diff) | |
| parent | video_core: Resolve more variable shadowing scenarios (diff) | |
| download | yuzu-e6a896c4bdf9cc47c2002c115c9ff280e540fd1b.tar.gz yuzu-e6a896c4bdf9cc47c2002c115c9ff280e540fd1b.tar.xz yuzu-e6a896c4bdf9cc47c2002c115c9ff280e540fd1b.zip | |
Merge pull request #5124 from lioncash/video-shadow
video_core: Resolve more variable shadowing scenarios
Diffstat (limited to 'src/video_core/command_classes')
| -rw-r--r-- | src/video_core/command_classes/codecs/vp9.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/command_classes/codecs/vp9.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/command_classes/codecs/vp9.cpp b/src/video_core/command_classes/codecs/vp9.cpp index 7d8d6ee3c..1771bc939 100644 --- a/src/video_core/command_classes/codecs/vp9.cpp +++ b/src/video_core/command_classes/codecs/vp9.cpp | |||
| @@ -233,7 +233,7 @@ constexpr std::array<s32, 254> map_lut{ | |||
| 233 | } | 233 | } |
| 234 | } // Anonymous namespace | 234 | } // Anonymous namespace |
| 235 | 235 | ||
| 236 | VP9::VP9(GPU& gpu) : gpu(gpu) {} | 236 | VP9::VP9(GPU& gpu_) : gpu{gpu_} {} |
| 237 | 237 | ||
| 238 | VP9::~VP9() = default; | 238 | VP9::~VP9() = default; |
| 239 | 239 | ||
diff --git a/src/video_core/command_classes/codecs/vp9.h b/src/video_core/command_classes/codecs/vp9.h index 9ebbbf59e..8396c8105 100644 --- a/src/video_core/command_classes/codecs/vp9.h +++ b/src/video_core/command_classes/codecs/vp9.h | |||
| @@ -108,7 +108,7 @@ private: | |||
| 108 | 108 | ||
| 109 | class VP9 { | 109 | class VP9 { |
| 110 | public: | 110 | public: |
| 111 | explicit VP9(GPU& gpu); | 111 | explicit VP9(GPU& gpu_); |
| 112 | ~VP9(); | 112 | ~VP9(); |
| 113 | 113 | ||
| 114 | VP9(const VP9&) = delete; | 114 | VP9(const VP9&) = delete; |