summaryrefslogtreecommitdiff
path: root/src/video_core/fence_manager.h
diff options
context:
space:
mode:
authorGravatar bunnei2020-12-05 00:48:08 -0800
committerGravatar GitHub2020-12-05 00:48:08 -0800
commite6a896c4bdf9cc47c2002c115c9ff280e540fd1b (patch)
treee5cd397cb3a11f1529f38ed8fa0a0185d07becaa /src/video_core/fence_manager.h
parentMerge pull request #5127 from FearlessTobi/port-5617 (diff)
parentvideo_core: Resolve more variable shadowing scenarios (diff)
downloadyuzu-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/fence_manager.h')
-rw-r--r--src/video_core/fence_manager.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/fence_manager.h b/src/video_core/fence_manager.h
index de6991ef6..c5f26896e 100644
--- a/src/video_core/fence_manager.h
+++ b/src/video_core/fence_manager.h
@@ -17,11 +17,11 @@ namespace VideoCommon {
17 17
18class FenceBase { 18class FenceBase {
19public: 19public:
20 FenceBase(u32 payload, bool is_stubbed) 20 explicit FenceBase(u32 payload_, bool is_stubbed_)
21 : address{}, payload{payload}, is_semaphore{false}, is_stubbed{is_stubbed} {} 21 : address{}, payload{payload_}, is_semaphore{false}, is_stubbed{is_stubbed_} {}
22 22
23 FenceBase(GPUVAddr address, u32 payload, bool is_stubbed) 23 explicit FenceBase(GPUVAddr address_, u32 payload_, bool is_stubbed_)
24 : address{address}, payload{payload}, is_semaphore{true}, is_stubbed{is_stubbed} {} 24 : address{address_}, payload{payload_}, is_semaphore{true}, is_stubbed{is_stubbed_} {}
25 25
26 GPUVAddr GetAddress() const { 26 GPUVAddr GetAddress() const {
27 return address; 27 return address;