diff options
author | ameerj <52414509+ameerj@users.noreply.github.com> | 2020-12-28 07:02:06 +0100 |
---|---|---|
committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-01-07 20:33:45 +0100 |
commit | 2c27127d04a155fe0f893e84263d58f14473785d (patch) | |
tree | e72b7d973f5c0dd4a553f815a632bf8fcc687998 /src/video_core/cdma_pusher.cpp | |
parent | Merge pull request #5306 from MerryMage/ignore-library-Open (diff) | |
download | yuzu-2c27127d04a155fe0f893e84263d58f14473785d.tar yuzu-2c27127d04a155fe0f893e84263d58f14473785d.tar.gz yuzu-2c27127d04a155fe0f893e84263d58f14473785d.tar.bz2 yuzu-2c27127d04a155fe0f893e84263d58f14473785d.tar.lz yuzu-2c27127d04a155fe0f893e84263d58f14473785d.tar.xz yuzu-2c27127d04a155fe0f893e84263d58f14473785d.tar.zst yuzu-2c27127d04a155fe0f893e84263d58f14473785d.zip |
Diffstat (limited to 'src/video_core/cdma_pusher.cpp')
-rw-r--r-- | src/video_core/cdma_pusher.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/video_core/cdma_pusher.cpp b/src/video_core/cdma_pusher.cpp index e3e7432f7..94679d5d1 100644 --- a/src/video_core/cdma_pusher.cpp +++ b/src/video_core/cdma_pusher.cpp @@ -33,8 +33,7 @@ CDmaPusher::CDmaPusher(GPU& gpu_) : gpu{gpu_}, nvdec_processor(std::make_shared<Nvdec>(gpu)), vic_processor(std::make_unique<Vic>(gpu, nvdec_processor)), host1x_processor(std::make_unique<Host1x>(gpu)), - nvdec_sync(std::make_unique<SyncptIncrManager>(gpu)), - vic_sync(std::make_unique<SyncptIncrManager>(gpu)) {} + sync_manager(std::make_unique<SyncptIncrManager>(gpu)) {} CDmaPusher::~CDmaPusher() = default; @@ -110,10 +109,10 @@ void CDmaPusher::ExecuteCommand(u32 state_offset, u32 data) { const auto syncpoint_id = static_cast<u32>(data & 0xFF); const auto cond = static_cast<u32>((data >> 8) & 0xFF); if (cond == 0) { - nvdec_sync->Increment(syncpoint_id); + sync_manager->Increment(syncpoint_id); } else { - nvdec_sync->IncrementWhenDone(static_cast<u32>(current_class), syncpoint_id); - nvdec_sync->SignalDone(syncpoint_id); + sync_manager->SignalDone( + sync_manager->IncrementWhenDone(static_cast<u32>(current_class), syncpoint_id)); } break; } @@ -135,10 +134,10 @@ void CDmaPusher::ExecuteCommand(u32 state_offset, u32 data) { const auto syncpoint_id = static_cast<u32>(data & 0xFF); const auto cond = static_cast<u32>((data >> 8) & 0xFF); if (cond == 0) { - vic_sync->Increment(syncpoint_id); + sync_manager->Increment(syncpoint_id); } else { - vic_sync->IncrementWhenDone(static_cast<u32>(current_class), syncpoint_id); - vic_sync->SignalDone(syncpoint_id); + sync_manager->SignalDone( + sync_manager->IncrementWhenDone(static_cast<u32>(current_class), syncpoint_id)); } break; } |