diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-03-27 17:12:53 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-03-27 17:12:57 +0100 |
| commit | e36f1a5ba96f000066c7fccd4463201ecd4215c0 (patch) | |
| tree | bdcd5d23e5ae76a6305ca18a5f1e9ee5608ceb11 /src/video_core/gpu.h | |
| parent | Merge pull request #2285 from lioncash/unused-struct (diff) | |
| download | yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.tar yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.tar.gz yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.tar.bz2 yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.tar.lz yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.tar.xz yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.tar.zst yuzu-e36f1a5ba96f000066c7fccd4463201ecd4215c0.zip | |
Diffstat (limited to 'src/video_core/gpu.h')
| -rw-r--r-- | src/video_core/gpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index c1830ac8d..de30ea354 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h @@ -177,11 +177,11 @@ public: u32 address_high; u32 address_low; - GPUVAddr SmaphoreAddress() const { + GPUVAddr SemaphoreAddress() const { return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high) << 32) | address_low); } - } smaphore_address; + } semaphore_address; u32 semaphore_sequence; u32 semaphore_trigger; @@ -263,7 +263,7 @@ private: static_assert(offsetof(GPU::Regs, field_name) == position * 4, \ "Field " #field_name " has invalid position") -ASSERT_REG_POSITION(smaphore_address, 0x4); +ASSERT_REG_POSITION(semaphore_address, 0x4); ASSERT_REG_POSITION(semaphore_sequence, 0x6); ASSERT_REG_POSITION(semaphore_trigger, 0x7); ASSERT_REG_POSITION(reference_count, 0x14); |