diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-05 00:48:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 00:48:08 -0800 |
| commit | e6a896c4bdf9cc47c2002c115c9ff280e540fd1b (patch) | |
| tree | e5cd397cb3a11f1529f38ed8fa0a0185d07becaa /src/video_core/command_classes/codecs | |
| parent | 63419e144ffeeb30220bacd6307360c76b4363f1 (diff) | |
| parent | 677a8b208d47d0d2397197ce74c7039a8ea79d20 (diff) | |
Merge pull request #5124 from lioncash/video-shadow
video_core: Resolve more variable shadowing scenarios
Diffstat (limited to 'src/video_core/command_classes/codecs')
| -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{ } } // Anonymous namespace -VP9::VP9(GPU& gpu) : gpu(gpu) {} +VP9::VP9(GPU& gpu_) : gpu{gpu_} {} VP9::~VP9() = default; 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: class VP9 { public: - explicit VP9(GPU& gpu); + explicit VP9(GPU& gpu_); ~VP9(); VP9(const VP9&) = delete; |