diff options
| author |  comex | 2023-07-01 15:01:11 -0700 |
|---|---|---|
| committer | comex | 2023-07-01 15:01:11 -0700 |
| commit | 98685d48e3cb9f25f6919f004ec62cadf33afad2 (patch) | |
| tree | 9df2ce7f57370641589bfae7196c77b090bcbe0f /src/core/arm | |
| parent | PR feedback + constification (diff) | |
| parent | Update translations (2023-07-01) (#10972) (diff) | |
| download | yuzu-98685d48e3cb9f25f6919f004ec62cadf33afad2.tar.gz yuzu-98685d48e3cb9f25f6919f004ec62cadf33afad2.tar.xz yuzu-98685d48e3cb9f25f6919f004ec62cadf33afad2.zip | |
Merge remote-tracking branch 'origin/master' into ssl
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 5acf9008d..3b82fb73c 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp | |||
| @@ -322,11 +322,6 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable* | |||
| 322 | } | 322 | } |
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | #ifdef ARCHITECTURE_arm64 | ||
| 326 | // TODO: remove when fixed in dynarmic | ||
| 327 | config.optimizations &= ~Dynarmic::OptimizationFlag::BlockLinking; | ||
| 328 | #endif | ||
| 329 | |||
| 330 | return std::make_unique<Dynarmic::A32::Jit>(config); | 325 | return std::make_unique<Dynarmic::A32::Jit>(config); |
| 331 | } | 326 | } |
| 332 | 327 | ||