diff options
| author | 2020-11-16 21:02:45 -0800 | |
|---|---|---|
| committer | 2020-12-06 00:03:24 -0800 | |
| commit | e18ee8d681bf05e8c1480dd1ad7133778ead773d (patch) | |
| tree | fd319df94f2fd26d621d1b14fc5c57d7cb567d9e /src/core/hle/kernel/thread.h | |
| parent | Merge pull request #5133 from lioncash/video-shadow2 (diff) | |
| download | yuzu-e18ee8d681bf05e8c1480dd1ad7133778ead773d.tar.gz yuzu-e18ee8d681bf05e8c1480dd1ad7133778ead773d.tar.xz yuzu-e18ee8d681bf05e8c1480dd1ad7133778ead773d.zip | |
hle: kernel: Port KAffinityMask from Mesosphere.
Diffstat (limited to 'src/core/hle/kernel/thread.h')
| -rw-r--r-- | src/core/hle/kernel/thread.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index a75071e9b..5192ecff1 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "common/common_types.h" | 12 | #include "common/common_types.h" |
| 13 | #include "common/spin_lock.h" | 13 | #include "common/spin_lock.h" |
| 14 | #include "core/arm/arm_interface.h" | 14 | #include "core/arm/arm_interface.h" |
| 15 | #include "core/hle/kernel/k_affinity_mask.h" | ||
| 15 | #include "core/hle/kernel/object.h" | 16 | #include "core/hle/kernel/object.h" |
| 16 | #include "core/hle/kernel/synchronization_object.h" | 17 | #include "core/hle/kernel/synchronization_object.h" |
| 17 | #include "core/hle/result.h" | 18 | #include "core/hle/result.h" |
| @@ -469,7 +470,7 @@ public: | |||
| 469 | return ideal_core; | 470 | return ideal_core; |
| 470 | } | 471 | } |
| 471 | 472 | ||
| 472 | u64 GetAffinityMask() const { | 473 | constexpr const KAffinityMask& GetAffinityMask() const { |
| 473 | return affinity_mask; | 474 | return affinity_mask; |
| 474 | } | 475 | } |
| 475 | 476 | ||
| @@ -649,10 +650,9 @@ private: | |||
| 649 | Scheduler* scheduler = nullptr; | 650 | Scheduler* scheduler = nullptr; |
| 650 | 651 | ||
| 651 | u32 ideal_core{0xFFFFFFFF}; | 652 | u32 ideal_core{0xFFFFFFFF}; |
| 652 | u64 affinity_mask{0x1}; | 653 | KAffinityMask affinity_mask{}; |
| 653 | 654 | ||
| 654 | s32 ideal_core_override = -1; | 655 | s32 ideal_core_override = -1; |
| 655 | u64 affinity_mask_override = 0x1; | ||
| 656 | u32 affinity_override_count = 0; | 656 | u32 affinity_override_count = 0; |
| 657 | 657 | ||
| 658 | u32 scheduling_state = 0; | 658 | u32 scheduling_state = 0; |