summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/video_core/gpu.cpp4
-rw-r--r--src/video_core/gpu.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index ee976f81f..c71f0f9bf 100644
--- a/src/video_core/gpu.cpp
+++ b/src/video_core/gpu.cpp
@@ -69,7 +69,7 @@ const DmaPusher& GPU::DmaPusher() const {
69 69
70void GPU::IncrementSyncPoint(const u32 syncpoint_id) { 70void GPU::IncrementSyncPoint(const u32 syncpoint_id) {
71 syncpoints[syncpoint_id]++; 71 syncpoints[syncpoint_id]++;
72 sync_guard.lock(); 72 sync_mutex.lock();
73 if (!events[syncpoint_id].empty()) { 73 if (!events[syncpoint_id].empty()) {
74 u32 value = syncpoints[syncpoint_id].load(); 74 u32 value = syncpoints[syncpoint_id].load();
75 auto it = events[syncpoint_id].begin(); 75 auto it = events[syncpoint_id].begin();
@@ -82,7 +82,7 @@ void GPU::IncrementSyncPoint(const u32 syncpoint_id) {
82 it++; 82 it++;
83 } 83 }
84 } 84 }
85 sync_guard.unlock(); 85 sync_mutex.unlock();
86} 86}
87 87
88u32 GPU::GetSyncpointValue(const u32 syncpoint_id) const { 88u32 GPU::GetSyncpointValue(const u32 syncpoint_id) const {
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h
index bc63920f2..ab1a4bdd4 100644
--- a/src/video_core/gpu.h
+++ b/src/video_core/gpu.h
@@ -8,11 +8,11 @@
8#include <atomic> 8#include <atomic>
9#include <list> 9#include <list>
10#include <memory> 10#include <memory>
11#include <mutex>
11#include "common/common_types.h" 12#include "common/common_types.h"
12#include "core/hle/service/nvdrv/nvdata.h" 13#include "core/hle/service/nvdrv/nvdata.h"
13#include "core/hle/service/nvflinger/buffer_queue.h" 14#include "core/hle/service/nvflinger/buffer_queue.h"
14#include "video_core/dma_pusher.h" 15#include "video_core/dma_pusher.h"
15#include "common/spin_lock.h"
16 16
17using CacheAddr = std::uintptr_t; 17using CacheAddr = std::uintptr_t;
18inline CacheAddr ToCacheAddr(const void* host_ptr) { 18inline CacheAddr ToCacheAddr(const void* host_ptr) {
@@ -178,9 +178,9 @@ public:
178 178
179 void Guard(bool guard_set) { 179 void Guard(bool guard_set) {
180 if (guard_set) { 180 if (guard_set) {
181 sync_guard.lock(); 181 sync_mutex.lock();
182 } else { 182 } else {
183 sync_guard.unlock(); 183 sync_mutex.unlock();
184 } 184 }
185 } 185 }
186 186
@@ -297,7 +297,7 @@ private:
297 297
298 std::array<std::list<Event>, Service::Nvidia::MaxSyncPoints> events; 298 std::array<std::list<Event>, Service::Nvidia::MaxSyncPoints> events;
299 299
300 Common::SpinLock sync_guard{}; 300 std::mutex sync_mutex;
301}; 301};
302 302
303#define ASSERT_REG_POSITION(field_name, position) \ 303#define ASSERT_REG_POSITION(field_name, position) \