Просмотр исходного кода

video_core/gpu: Amend typo in GPU member variable name

smaphore -> semaphore
Lioncash 7 лет назад
Родитель
Сommit
e36f1a5ba9
2 измененных файлов с 8 добавлено и 7 удалено
  1. 5 4
      src/video_core/gpu.cpp
  2. 3 3
      src/video_core/gpu.h

+ 5 - 4
src/video_core/gpu.cpp

@@ -286,9 +286,10 @@ void GPU::ProcessSemaphoreTriggerMethod() {
         // TODO(Kmather73): Generate a real GPU timestamp and write it here instead of
         // TODO(Kmather73): Generate a real GPU timestamp and write it here instead of
         // CoreTiming
         // CoreTiming
         block.timestamp = Core::System::GetInstance().CoreTiming().GetTicks();
         block.timestamp = Core::System::GetInstance().CoreTiming().GetTicks();
-        memory_manager->WriteBlock(regs.smaphore_address.SmaphoreAddress(), &block, sizeof(block));
+        memory_manager->WriteBlock(regs.semaphore_address.SemaphoreAddress(), &block,
+                                   sizeof(block));
     } else {
     } else {
-        const u32 word{memory_manager->Read<u32>(regs.smaphore_address.SmaphoreAddress())};
+        const u32 word{memory_manager->Read<u32>(regs.semaphore_address.SemaphoreAddress())};
         if ((op == GpuSemaphoreOperation::AcquireEqual && word == regs.semaphore_sequence) ||
         if ((op == GpuSemaphoreOperation::AcquireEqual && word == regs.semaphore_sequence) ||
             (op == GpuSemaphoreOperation::AcquireGequal &&
             (op == GpuSemaphoreOperation::AcquireGequal &&
              static_cast<s32>(word - regs.semaphore_sequence) > 0) ||
              static_cast<s32>(word - regs.semaphore_sequence) > 0) ||
@@ -315,11 +316,11 @@ void GPU::ProcessSemaphoreTriggerMethod() {
 }
 }
 
 
 void GPU::ProcessSemaphoreRelease() {
 void GPU::ProcessSemaphoreRelease() {
-    memory_manager->Write<u32>(regs.smaphore_address.SmaphoreAddress(), regs.semaphore_release);
+    memory_manager->Write<u32>(regs.semaphore_address.SemaphoreAddress(), regs.semaphore_release);
 }
 }
 
 
 void GPU::ProcessSemaphoreAcquire() {
 void GPU::ProcessSemaphoreAcquire() {
-    const u32 word = memory_manager->Read<u32>(regs.smaphore_address.SmaphoreAddress());
+    const u32 word = memory_manager->Read<u32>(regs.semaphore_address.SemaphoreAddress());
     const auto value = regs.semaphore_acquire;
     const auto value = regs.semaphore_acquire;
     if (word != value) {
     if (word != value) {
         regs.acquire_active = true;
         regs.acquire_active = true;

+ 3 - 3
src/video_core/gpu.h

@@ -177,11 +177,11 @@ public:
                     u32 address_high;
                     u32 address_high;
                     u32 address_low;
                     u32 address_low;
 
 
-                    GPUVAddr SmaphoreAddress() const {
+                    GPUVAddr SemaphoreAddress() const {
                         return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high) << 32) |
                         return static_cast<GPUVAddr>((static_cast<GPUVAddr>(address_high) << 32) |
                                                      address_low);
                                                      address_low);
                     }
                     }
-                } smaphore_address;
+                } semaphore_address;
 
 
                 u32 semaphore_sequence;
                 u32 semaphore_sequence;
                 u32 semaphore_trigger;
                 u32 semaphore_trigger;
@@ -263,7 +263,7 @@ private:
     static_assert(offsetof(GPU::Regs, field_name) == position * 4,                                 \
     static_assert(offsetof(GPU::Regs, field_name) == position * 4,                                 \
                   "Field " #field_name " has invalid position")
                   "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_sequence, 0x6);
 ASSERT_REG_POSITION(semaphore_trigger, 0x7);
 ASSERT_REG_POSITION(semaphore_trigger, 0x7);
 ASSERT_REG_POSITION(reference_count, 0x14);
 ASSERT_REG_POSITION(reference_count, 0x14);