summaryrefslogtreecommitdiff
path: root/src/video_core/gpu.h
diff options
context:
space:
mode:
authorGravatar Lioncash2020-12-04 14:39:12 -0500
committerGravatar Lioncash2020-12-04 16:19:09 -0500
commit677a8b208d47d0d2397197ce74c7039a8ea79d20 (patch)
tree51f6cc58b69b42c7af300c6c56abd0af37e0c748 /src/video_core/gpu.h
parentMerge pull request #5064 from lioncash/node-shadow (diff)
downloadyuzu-677a8b208d47d0d2397197ce74c7039a8ea79d20.tar.gz
yuzu-677a8b208d47d0d2397197ce74c7039a8ea79d20.tar.xz
yuzu-677a8b208d47d0d2397197ce74c7039a8ea79d20.zip
video_core: Resolve more variable shadowing scenarios
Resolves variable shadowing scenarios up to the end of the OpenGL code to make it nicer to review. The rest will be resolved in a following commit.
Diffstat (limited to 'src/video_core/gpu.h')
-rw-r--r--src/video_core/gpu.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index 21410e125..660641d04 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -149,16 +149,16 @@ public:
149 u32 subchannel{}; 149 u32 subchannel{};
150 u32 method_count{}; 150 u32 method_count{};
151 151
152 MethodCall(u32 method, u32 argument, u32 subchannel = 0, u32 method_count = 0) 152 explicit MethodCall(u32 method_, u32 argument_, u32 subchannel_ = 0, u32 method_count_ = 0)
153 : method(method), argument(argument), subchannel(subchannel), 153 : method(method_), argument(argument_), subchannel(subchannel_),
154 method_count(method_count) {} 154 method_count(method_count_) {}
155 155
156 [[nodiscard]] bool IsLastCall() const { 156 [[nodiscard]] bool IsLastCall() const {
157 return method_count <= 1; 157 return method_count <= 1;
158 } 158 }
159 }; 159 };
160 160
161 explicit GPU(Core::System& system, bool is_async, bool use_nvdec); 161 explicit GPU(Core::System& system_, bool is_async_, bool use_nvdec_);
162 virtual ~GPU(); 162 virtual ~GPU();
163 163
164 /// Binds a renderer to the GPU. 164 /// Binds a renderer to the GPU.
@@ -414,8 +414,8 @@ private:
414 std::condition_variable sync_cv; 414 std::condition_variable sync_cv;
415 415
416 struct FlushRequest { 416 struct FlushRequest {
417 FlushRequest(u64 fence, VAddr addr, std::size_t size) 417 explicit FlushRequest(u64 fence_, VAddr addr_, std::size_t size_)
418 : fence{fence}, addr{addr}, size{size} {} 418 : fence{fence_}, addr{addr_}, size{size_} {}
419 u64 fence; 419 u64 fence;
420 VAddr addr; 420 VAddr addr;
421 std::size_t size; 421 std::size_t size;