diff options
| author | 2019-03-28 17:54:20 -0400 | |
|---|---|---|
| committer | 2019-03-28 17:54:20 -0400 | |
| commit | a09d8cc8a274bfe6e1cf7318f81f9635fe3a4258 (patch) | |
| tree | bdcd5d23e5ae76a6305ca18a5f1e9ee5608ceb11 /src/video_core/gpu.h | |
| parent | Merge pull request #2285 from lioncash/unused-struct (diff) | |
| parent | video_core/gpu: Amend typo in GPU member variable name (diff) | |
| download | yuzu-a09d8cc8a274bfe6e1cf7318f81f9635fe3a4258.tar.gz yuzu-a09d8cc8a274bfe6e1cf7318f81f9635fe3a4258.tar.xz yuzu-a09d8cc8a274bfe6e1cf7318f81f9635fe3a4258.zip | |
Merge pull request #2295 from lioncash/typo
video_core/gpu: Amend typo in GPU member variable name
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: | |||
| 177 | u32 address_high; | 177 | u32 address_high; |
| 178 | u32 address_low; | 178 | u32 address_low; |
| 179 | 179 | ||
| 180 | GPUVAddr SmaphoreAddress() const { | 180 | GPUVAddr SemaphoreAddress() const { |
| 181 | return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high) << 32) | | 181 | return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high) << 32) | |
| 182 | address_low); | 182 | address_low); |
| 183 | } | 183 | } |
| 184 | } smaphore_address; | 184 | } semaphore_address; |
| 185 | 185 | ||
| 186 | u32 semaphore_sequence; | 186 | u32 semaphore_sequence; |
| 187 | u32 semaphore_trigger; | 187 | u32 semaphore_trigger; |
| @@ -263,7 +263,7 @@ private: | |||
| 263 | static_assert(offsetof(GPU::Regs, field_name) == position * 4, \ | 263 | static_assert(offsetof(GPU::Regs, field_name) == position * 4, \ |
| 264 | "Field " #field_name " has invalid position") | 264 | "Field " #field_name " has invalid position") |
| 265 | 265 | ||
| 266 | ASSERT_REG_POSITION(smaphore_address, 0x4); | 266 | ASSERT_REG_POSITION(semaphore_address, 0x4); |
| 267 | ASSERT_REG_POSITION(semaphore_sequence, 0x6); | 267 | ASSERT_REG_POSITION(semaphore_sequence, 0x6); |
| 268 | ASSERT_REG_POSITION(semaphore_trigger, 0x7); | 268 | ASSERT_REG_POSITION(semaphore_trigger, 0x7); |
| 269 | ASSERT_REG_POSITION(reference_count, 0x14); | 269 | ASSERT_REG_POSITION(reference_count, 0x14); |