sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added some CPU vendors 

Former-commit-id: 0eb96633fe6bdd3f6f8649f766620f4e89bc2224
This commit is contained in:
Lynix 2014-04-21 11:02:17 +02:00
parent 55fe71ee21
commit 77fc34ee7d
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Core/Enums.hpp
View File

@ -116,16 +116,20 @@ enum nzProcessorVendor
nzProcessorVendor_Centaur, nzProcessorVendor_Centaur,
nzProcessorVendor_Cyrix, nzProcessorVendor_Cyrix,
nzProcessorVendor_Intel, nzProcessorVendor_Intel,
nzProcessorVendor_Transmeta, nzProcessorVendor_KVM,
nzProcessorVendor_HyperV,
nzProcessorVendor_NSC, nzProcessorVendor_NSC,
nzProcessorVendor_NexGen, nzProcessorVendor_NexGen,
nzProcessorVendor_Rise, nzProcessorVendor_Rise,
nzProcessorVendor_SIS, nzProcessorVendor_SIS,
nzProcessorVendor_Transmeta,
nzProcessorVendor_UMC, nzProcessorVendor_UMC,
nzProcessorVendor_VIA, nzProcessorVendor_VIA,
nzProcessorVendor_VMware,
nzProcessorVendor_Vortex, nzProcessorVendor_Vortex,
nzProcessorVendor_XenHVM,
nzProcessorVendor_Max = nzProcessorVendor_Vortex nzProcessorVendor_Max = nzProcessorVendor_XenHVM
}; };
enum nzSphereType enum nzSphereType

18
src/Nazara/Core/HardwareInfo.cpp
View File

@ -25,23 +25,30 @@ namespace
nzProcessorVendor vendorEnum; nzProcessorVendor vendorEnum;
}; };
const char* vendorNames[nzProcessorVendor_Max+2] = // +1 pour gérer le cas Unknown // Exceptionellement, la valeur "unknown" est intégrée
const char* vendorNames[] =
{ {
"Unknown", // nzProcessorVendor_Unknown "Unknown", // nzProcessorVendor_Unknown
"Advanced Micro Devices", // nzProcessorVendor_AMD "Advanced Micro Devices", // nzProcessorVendor_AMD
"Centaur Technology", // nzProcessorVendor_Centaur "Centaur Technology", // nzProcessorVendor_Centaur
"Cyrix Corporation", // nzProcessorVendor_Cyrix "Cyrix Corporation", // nzProcessorVendor_Cyrix
"Intel Corporation", // nzProcessorVendor_Intel "Intel Corporation", // nzProcessorVendor_Intel
"Transmeta Corporation", // nzProcessorVendor_Transmeta "Kernel-based Virtual Machine", // nzProcessorVendor_KVM
"Microsoft Hyper-V", // nzProcessorVendor_HyperV
"National Semiconductor", // nzProcessorVendor_NSC "National Semiconductor", // nzProcessorVendor_NSC
"NexGen", // nzProcessorVendor_NexGen "NexGen", // nzProcessorVendor_NexGen
"Rise Technology", // nzProcessorVendor_Rise "Rise Technology", // nzProcessorVendor_Rise
"Silicon Integrated Systems", // nzProcessorVendor_SIS "Silicon Integrated Systems", // nzProcessorVendor_SIS
"Transmeta Corporation", // nzProcessorVendor_Transmeta
"United Microelectronics Corporation", // nzProcessorVendor_UMC "United Microelectronics Corporation", // nzProcessorVendor_UMC
"VIA Technologies", // nzProcessorVendor_VIA "VIA Technologies", // nzProcessorVendor_VIA
"VMware", // nzProcessorVendor_VMware
"Vortex86", // nzProcessorVendor_Vortex "Vortex86", // nzProcessorVendor_Vortex
"Xen" // nzProcessorVendor_XenHVM
}; };
static_assert(sizeof(vendorNames)/sizeof(const char*) == nzProcessorVendor_Max+2, "Processor vendor name array is incomplete");
VendorString vendorStrings[] = VendorString vendorStrings[] =
{ {
// Triés par ordre alphabétique (Majuscules primant sur minuscules) // Triés par ordre alphabétique (Majuscules primant sur minuscules)
@ -52,12 +59,17 @@ namespace
{"GenuineIntel", nzProcessorVendor_Intel}, {"GenuineIntel", nzProcessorVendor_Intel},
{"GenuineTMx86", nzProcessorVendor_Transmeta}, {"GenuineTMx86", nzProcessorVendor_Transmeta},
{"Geode by NSC", nzProcessorVendor_NSC}, {"Geode by NSC", nzProcessorVendor_NSC},
{"KVMKVMKVMKVM", nzProcessorVendor_KVM},
{"Microsoft Hv", nzProcessorVendor_HyperV},
{"NexGenDriven", nzProcessorVendor_NexGen}, {"NexGenDriven", nzProcessorVendor_NexGen},
{"RiseRiseRise", nzProcessorVendor_Rise},
{"SiS SiS SiS ", nzProcessorVendor_SIS}, {"SiS SiS SiS ", nzProcessorVendor_SIS},
{"TransmetaCPU", nzProcessorVendor_Transmeta}, {"TransmetaCPU", nzProcessorVendor_Transmeta},
{"UMC UMC UMC ", nzProcessorVendor_UMC}, {"UMC UMC UMC ", nzProcessorVendor_UMC},
{"VIA VIA VIA ", nzProcessorVendor_VIA}, {"VIA VIA VIA ", nzProcessorVendor_VIA},
{"Vortex86 SoC", nzProcessorVendor_VIA} {"VMwareVMware", nzProcessorVendor_VMware},
{"Vortex86 SoC", nzProcessorVendor_Vortex},
{"XenVMMXenVMM", nzProcessorVendor_XenHVM}
}; };
nzProcessorVendor s_vendorEnum = nzProcessorVendor_Unknown; nzProcessorVendor s_vendorEnum = nzProcessorVendor_Unknown;