Merge pull request #7958 from Craftyawesome/cpu-emulation-order

Re-order cpu emulation options from fastest to slowest
This commit is contained in:
Léo Lam 2019-05-01 17:56:19 +02:00 committed by GitHub
commit f4d7b537cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions

View File

@ -5,32 +5,32 @@
<!-- New UI CPU Core selection - Default --> <!-- New UI CPU Core selection - Default -->
<string-array name="emuCoresEntriesX86_64" translatable="false"> <string-array name="emuCoresEntriesX86_64" translatable="false">
<item>Interpreter</item>
<item>Cached Interpreter</item>
<item>JIT Recompiler</item> <item>JIT Recompiler</item>
<item>Cached Interpreter</item>
<item>Interpreter</item>
</string-array> </string-array>
<integer-array name="emuCoresValuesX86_64" translatable="false"> <integer-array name="emuCoresValuesX86_64" translatable="false">
<item>0</item>
<item>5</item>
<item>1</item> <item>1</item>
<item>5</item>
<item>0</item>
</integer-array> </integer-array>
<string-array name="emuCoresEntriesARM64" translatable="false"> <string-array name="emuCoresEntriesARM64" translatable="false">
<item>Interpreter</item>
<item>Cached Interpreter</item>
<item>JIT ARM64 Recompiler</item> <item>JIT ARM64 Recompiler</item>
<item>Cached Interpreter</item>
<item>Interpreter</item>
</string-array> </string-array>
<integer-array name="emuCoresValuesARM64" translatable="false"> <integer-array name="emuCoresValuesARM64" translatable="false">
<item>0</item>
<item>5</item>
<item>4</item> <item>4</item>
<item>5</item>
<item>0</item>
</integer-array> </integer-array>
<string-array name="emuCoresEntriesGeneric" translatable="false"> <string-array name="emuCoresEntriesGeneric" translatable="false">
<item>Interpreter</item>
<item>Cached Interpreter</item> <item>Cached Interpreter</item>
<item>Interpreter</item>
</string-array> </string-array>
<integer-array name="emuCoresValuesGeneric" translatable="false"> <integer-array name="emuCoresValuesGeneric" translatable="false">
<item>0</item>
<item>5</item> <item>5</item>
<item>0</item>
</integer-array> </integer-array>
<!-- GameCube System Languages --> <!-- GameCube System Languages -->

View File

@ -213,13 +213,13 @@ static void InitializeCPUCore(CPUCore cpu_core)
const std::vector<CPUCore>& AvailableCPUCores() const std::vector<CPUCore>& AvailableCPUCores()
{ {
static const std::vector<CPUCore> cpu_cores = { static const std::vector<CPUCore> cpu_cores = {
CPUCore::Interpreter,
CPUCore::CachedInterpreter,
#ifdef _M_X86_64 #ifdef _M_X86_64
CPUCore::JIT64, CPUCore::JIT64,
#elif defined(_M_ARM_64) #elif defined(_M_ARM_64)
CPUCore::JITARM64, CPUCore::JITARM64,
#endif #endif
CPUCore::CachedInterpreter,
CPUCore::Interpreter,
}; };
return cpu_cores; return cpu_cores;