diff options
| author | 2019-03-27 12:12:53 -0400 | |
|---|---|---|
| committer | 2019-03-27 12:12:57 -0400 | |
| commit | e36f1a5ba96f000066c7fccd4463201ecd4215c0 (patch) | |
| tree | bdcd5d23e5ae76a6305ca18a5f1e9ee5608ceb11 /src/video_core/gpu.cpp | |
| parent | Merge pull request #2285 from lioncash/unused-struct (diff) | |
| download | yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.tar.gz yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.tar.xz yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.zip | |
video_core/gpu: Amend typo in GPU member variable name
smaphore -> semaphore
Diffstat (limited to 'src/video_core/gpu.cpp')
| -rw-r--r-- | src/video_core/gpu.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 267a03f2d..30b29e14d 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp | |||
| @@ -286,9 +286,10 @@ void GPU::ProcessSemaphoreTriggerMethod() { | |||
| 286 | // TODO(Kmather73): Generate a real GPU timestamp and write it here instead of | 286 | // TODO(Kmather73): Generate a real GPU timestamp and write it here instead of |
| 287 | // CoreTiming | 287 | // CoreTiming |
| 288 | block.timestamp = Core::System::GetInstance().CoreTiming().GetTicks(); | 288 | block.timestamp = Core::System::GetInstance().CoreTiming().GetTicks(); |
| 289 | memory_manager->WriteBlock(regs.smaphore_address.SmaphoreAddress(), &block, sizeof(block)); | 289 | memory_manager->WriteBlock(regs.semaphore_address.SemaphoreAddress(), &block, |
| 290 | sizeof(block)); | ||
| 290 | } else { | 291 | } else { |
| 291 | const u32 word{memory_manager->Read<u32>(regs.smaphore_address.SmaphoreAddress())}; | 292 | const u32 word{memory_manager->Read<u32>(regs.semaphore_address.SemaphoreAddress())}; |
| 292 | if ((op == GpuSemaphoreOperation::AcquireEqual && word == regs.semaphore_sequence) || | 293 | if ((op == GpuSemaphoreOperation::AcquireEqual && word == regs.semaphore_sequence) || |
| 293 | (op == GpuSemaphoreOperation::AcquireGequal && | 294 | (op == GpuSemaphoreOperation::AcquireGequal && |
| 294 | static_cast<s32>(word - regs.semaphore_sequence) > 0) || | 295 | static_cast<s32>(word - regs.semaphore_sequence) > 0) || |
| @@ -315,11 +316,11 @@ void GPU::ProcessSemaphoreTriggerMethod() { | |||
| 315 | } | 316 | } |
| 316 | 317 | ||
| 317 | void GPU::ProcessSemaphoreRelease() { | 318 | void GPU::ProcessSemaphoreRelease() { |
| 318 | memory_manager->Write<u32>(regs.smaphore_address.SmaphoreAddress(), regs.semaphore_release); | 319 | memory_manager->Write<u32>(regs.semaphore_address.SemaphoreAddress(), regs.semaphore_release); |
| 319 | } | 320 | } |
| 320 | 321 | ||
| 321 | void GPU::ProcessSemaphoreAcquire() { | 322 | void GPU::ProcessSemaphoreAcquire() { |
| 322 | const u32 word = memory_manager->Read<u32>(regs.smaphore_address.SmaphoreAddress()); | 323 | const u32 word = memory_manager->Read<u32>(regs.semaphore_address.SemaphoreAddress()); |
| 323 | const auto value = regs.semaphore_acquire; | 324 | const auto value = regs.semaphore_acquire; |
| 324 | if (word != value) { | 325 | if (word != value) { |
| 325 | regs.acquire_active = true; | 326 | regs.acquire_active = true; |