summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-06-18 22:58:29 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-07-05 21:49:31 +0200
commitb391e5f6386eecf6170b544245e3e4e31427913c (patch)
tree8a6cb553577e6f0e5f059d212fecee9e32fdc08d /src/video_core
parentNVServices: Make NVEvents Automatic according to documentation. (diff)
downloadyuzu-b391e5f6386eecf6170b544245e3e4e31427913c.tar
yuzu-b391e5f6386eecf6170b544245e3e4e31427913c.tar.gz
yuzu-b391e5f6386eecf6170b544245e3e4e31427913c.tar.bz2
yuzu-b391e5f6386eecf6170b544245e3e4e31427913c.tar.lz
yuzu-b391e5f6386eecf6170b544245e3e4e31427913c.tar.xz
yuzu-b391e5f6386eecf6170b544245e3e4e31427913c.tar.zst
yuzu-b391e5f6386eecf6170b544245e3e4e31427913c.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/gpu.cpp6
-rw-r--r--src/video_core/gpu_thread.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index cdb2f804e..278528618 100644
--- a/src/video_core/gpu.cpp
+++ b/src/video_core/gpu.cpp
@@ -69,7 +69,7 @@ const DmaPusher& GPU::DmaPusher() const {
void GPU::IncrementSyncPoint(const u32 syncpoint_id) {
syncpoints[syncpoint_id]++;
- sync_mutex.lock();
+ std::lock_guard lock{sync_mutex};
if (!syncpt_interrupts[syncpoint_id].empty()) {
u32 value = syncpoints[syncpoint_id].load();
auto it = syncpt_interrupts[syncpoint_id].begin();
@@ -82,7 +82,6 @@ void GPU::IncrementSyncPoint(const u32 syncpoint_id) {
it++;
}
}
- sync_mutex.unlock();
}
u32 GPU::GetSyncpointValue(const u32 syncpoint_id) const {
@@ -98,7 +97,7 @@ void GPU::RegisterSyncptInterrupt(const u32 syncpoint_id, const u32 value) {
}
bool GPU::CancelSyncptInterrupt(const u32 syncpoint_id, const u32 value) {
- sync_mutex.lock();
+ std::lock_guard lock{sync_mutex};
auto it = syncpt_interrupts[syncpoint_id].begin();
while (it != syncpt_interrupts[syncpoint_id].end()) {
if (value == *it) {
@@ -108,7 +107,6 @@ bool GPU::CancelSyncptInterrupt(const u32 syncpoint_id, const u32 value) {
it++;
}
return false;
- sync_mutex.unlock();
}
u32 RenderTargetBytesPerPixel(RenderTargetFormat format) {
diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp
index b87938fdd..b441e92b0 100644
--- a/src/video_core/gpu_thread.cpp
+++ b/src/video_core/gpu_thread.cpp
@@ -21,7 +21,8 @@ static void RunThread(VideoCore::RendererBase& renderer, Tegra::DmaPusher& dma_p
MicroProfileOnThreadCreate("GpuThread");
// Wait for first GPU command before acquiring the window context
- while (state.queue.Empty());
+ while (state.queue.Empty())
+ ;
// If emulation was stopped during disk shader loading, abort before trying to acquire context
if (!state.is_running) {
@@ -103,7 +104,8 @@ u64 ThreadManager::PushCommand(CommandData&& command_data) {
MICROPROFILE_DEFINE(GPU_wait, "GPU", "Wait for the GPU", MP_RGB(128, 128, 192));
void SynchState::WaitForSynchronization(u64 fence) {
- while (signaled_fence.load() < fence);
+ while (signaled_fence.load() < fence)
+ ;
}
} // namespace VideoCommon::GPUThread