TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

macos platform fixes for intel macs

Browse source
This commit is contained in:
Jeff Hutchinson 2021-09-25 22:39:40 -04:00
parent 433d32f237
commit 7cb306b65a
6 changed files with 132 additions and 885 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Engine/source/platform/platformCPU.cpp
View file

@ -28,48 +28,8 @@
Signal<void(void)> Platform::SystemInfoReady;
enum CPUFlags
void SetProcessoInfo(Platform::SystemInfo_struct::Processor& pInfo, char* vendor, char* brand)
{
// EDX Register flags
BIT_RDTSC = BIT(4),
BIT_MMX = BIT(23),
BIT_SSE = BIT(25),
BIT_SSE2 = BIT(26),
BIT_3DNOW = BIT(31), // only available for amd cpus in x86
// These use a different value for comparison than the above flags (ECX Register)
BIT_SSE3 = BIT(0),
BIT_SSE3xt = BIT(9),
BIT_SSE4_1 = BIT(19),
BIT_SSE4_2 = BIT(20),
};
// fill the specified structure with information obtained from asm code
void SetProcessorInfo(Platform::SystemInfo_struct::Processor& pInfo,
char* vendor, char* brand, U32 processor, U32 properties, U32 properties2)
{
// always assume FPU is available in 2021...
pInfo.properties |= CPU_PROP_FPU;
#if defined(TORQUE_CPU_X86) || defined(TORQUE_CPU_X64) || defined(TORQUE_CPU_ARM64)
pInfo.properties |= CPU_PROP_LE;
#endif
#if defined(TORQUE_CPU_X64) || defined(TORQUE_CPU_ARM64)
pInfo.properties |= CPU_PROP_64bit;
#endif
#if defined(TORQUE_CPU_X86) || defined(TORQUE_CPU_X64)
pInfo.properties |= (properties & BIT_RDTSC) ? CPU_PROP_RDTSC : 0;
pInfo.properties |= (properties & BIT_MMX) ? CPU_PROP_MMX : 0;
pInfo.properties |= (properties & BIT_SSE) ? CPU_PROP_SSE : 0;
pInfo.properties |= (properties & BIT_SSE2) ? CPU_PROP_SSE2 : 0;
pInfo.properties |= (properties2 & BIT_SSE3) ? CPU_PROP_SSE3 : 0;
pInfo.properties |= (properties2 & BIT_SSE3xt) ? CPU_PROP_SSE3xt : 0;
pInfo.properties |= (properties2 & BIT_SSE4_1) ? CPU_PROP_SSE4_1 : 0;
pInfo.properties |= (properties2 & BIT_SSE4_2) ? CPU_PROP_SSE4_2 : 0;
#endif
if (dStricmp(vendor, "GenuineIntel") == 0)
{
pInfo.type = CPU_Intel;
@ -80,9 +40,6 @@ void SetProcessorInfo(Platform::SystemInfo_struct::Processor& pInfo,
{
pInfo.name = StringTable->insert(brand ? brand : "AMD (unknown)");
pInfo.type = CPU_AMD;
// 3dnow! is only available in AMD cpus on x86. Otherwise its not reliably set.
pInfo.properties |= (properties & BIT_3DNOW) ? CPU_PROP_3DNOW : 0;
}
else if (dStricmp(vendor, "Apple") == 0)
{
@ -92,18 +49,22 @@ void SetProcessorInfo(Platform::SystemInfo_struct::Processor& pInfo,
else
{
#if defined(TORQUE_CPU_X86) || defined(TORQUE_CPU_X64)
pInfo.name = StringTable->insert(brand ? brand : "x86 Compatible (unknown)");
pInfo.type = CPU_X86Compatible;
#elif defined(TORQUE_CPU_ARM64)
pInfo.name = StringTable->insert(brand ? brand : "Arm Compatible (unknown)");
pInfo.type = CPU_ArmCompatible;
#else
#error "Unknown CPU Architecture"
#endif
}
// Get multithreading caps.
CPUInfo::EConfig config = CPUInfo::CPUCount( pInfo.numLogicalProcessors, pInfo.numAvailableCores, pInfo.numPhysicalProcessors );
CPUInfo::EConfig config = CPUInfo::CPUCount( pInfo.numLogicalProcessors, pInfo.numPhysicalProcessors );
pInfo.isHyperThreaded = CPUInfo::isHyperThreaded( config );
pInfo.isMultiCore = CPUInfo::isMultiCore( config );