diff options
| author | 2021-11-26 18:15:43 +0100 | |
|---|---|---|
| committer | 2021-12-06 16:39:17 -0800 | |
| commit | 3c2a451f47c54cb39870f8f106edbdd09b3a458d (patch) | |
| tree | 9f93dafbc411267e1cbfffceb18f4190a8a6aa3b /src | |
| parent | hle: kernel: Add a flag for indicating that the kernel is currently shutting ... (diff) | |
| download | yuzu-3c2a451f47c54cb39870f8f106edbdd09b3a458d.tar.gz yuzu-3c2a451f47c54cb39870f8f106edbdd09b3a458d.tar.xz yuzu-3c2a451f47c54cb39870f8f106edbdd09b3a458d.zip | |
hle: kernel: fix scheduling ops from HLE host thread.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/k_scheduler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/k_scheduler.cpp b/src/core/hle/kernel/k_scheduler.cpp index 5423b187e..d3b1b2419 100644 --- a/src/core/hle/kernel/k_scheduler.cpp +++ b/src/core/hle/kernel/k_scheduler.cpp | |||
| @@ -240,8 +240,8 @@ void KScheduler::OnThreadPriorityChanged(KernelCore& kernel, KThread* thread, s3 | |||
| 240 | 240 | ||
| 241 | // If the thread is runnable, we want to change its priority in the queue. | 241 | // If the thread is runnable, we want to change its priority in the queue. |
| 242 | if (thread->GetRawState() == ThreadState::Runnable) { | 242 | if (thread->GetRawState() == ThreadState::Runnable) { |
| 243 | GetPriorityQueue(kernel).ChangePriority( | 243 | GetPriorityQueue(kernel).ChangePriority(old_priority, |
| 244 | old_priority, thread == kernel.CurrentScheduler()->GetCurrentThread(), thread); | 244 | thread == kernel.GetCurrentEmuThread(), thread); |
| 245 | IncrementScheduledCount(thread); | 245 | IncrementScheduledCount(thread); |
| 246 | SetSchedulerUpdateNeeded(kernel); | 246 | SetSchedulerUpdateNeeded(kernel); |
| 247 | } | 247 | } |
| @@ -360,7 +360,7 @@ void KScheduler::RotateScheduledQueue(s32 cpu_core_id, s32 priority) { | |||
| 360 | } | 360 | } |
| 361 | 361 | ||
| 362 | bool KScheduler::CanSchedule(KernelCore& kernel) { | 362 | bool KScheduler::CanSchedule(KernelCore& kernel) { |
| 363 | return kernel.CurrentScheduler()->GetCurrentThread()->GetDisableDispatchCount() <= 1; | 363 | return kernel.GetCurrentEmuThread()->GetDisableDispatchCount() <= 1; |
| 364 | } | 364 | } |
| 365 | 365 | ||
| 366 | bool KScheduler::IsSchedulerUpdateNeeded(const KernelCore& kernel) { | 366 | bool KScheduler::IsSchedulerUpdateNeeded(const KernelCore& kernel) { |