From 242320e735bfa79f065d89529f966e3e3eb2465a Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Wed, 14 Sep 2022 02:23:06 +0200
Subject: [PATCH] Also check CPU for SSE 3, SSSE 3 and POPCNT.

Check for SSE 3, SSSE 3 and POPCNT in CheckCPU(), and SSE, SSE2 in MathLib_Init().
This should fix all crash cases caused by launching the game on unsupported CPU's.
---
 r5dev/core/dllmain.cpp |  5 +++++
 r5dev/core/init.cpp    | 36 +++++++++++++++++++-----------------
 r5dev/tier0/cpu.cpp    |  1 +
 r5dev/tier0/platform.h |  1 +
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/r5dev/core/dllmain.cpp b/r5dev/core/dllmain.cpp
index 71ba803d..6d2234c2 100644
--- a/r5dev/core/dllmain.cpp
+++ b/r5dev/core/dllmain.cpp
@@ -9,6 +9,7 @@
 #endif // !DEDICATED
 #include "windows/console.h"
 #include "windows/system.h"
+#include "mathlib/mathlib.h"
 #include "launcher/launcher.h"
 
 //#############################################################################
@@ -19,6 +20,9 @@ void SDK_Init()
 {
     CheckCPU(); // Check CPU as early as possible, SpdLog also uses SIMD intrinsics.
 
+    MathLib_Init(); // Initialize Mathlib.
+    WinSock_Init(); // Initialize Winsock.
+
     if (strstr(GetCommandLineA(), "-launcher"))
     {
         g_svCmdLine = GetCommandLineA();
@@ -68,6 +72,7 @@ void SDK_Shutdown()
     bShutDown = true;
     spdlog::info("Shutdown GameSDK\n");
 
+    WinSock_Shutdown();
     Systems_Shutdown();
     WinSys_Detach();
 
diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index 7c659f6c..da25a767 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -36,7 +36,6 @@
 #ifndef DEDICATED
 #include "milessdk/win64_rrthreads.h"
 #endif // !DEDICATED
-#include "mathlib/mathlib.h"
 #include "vphysics/QHull.h"
 #include "bsplib/bsplib.h"
 #include "materialsystem/cmaterialsystem.h"
@@ -138,9 +137,6 @@ void Systems_Init()
 
 	initTimer.Start();
 
-	WinSock_Init(); // Initialize Winsock.
-	MathLib_Init(); // Initialize Mathlib.
-
 	// Begin the detour transaction to hook the process
 	DetourTransactionBegin();
 	DetourUpdateThread(GetCurrentThread());
@@ -265,9 +261,6 @@ void Systems_Shutdown()
 	CFastTimer shutdownTimer;
 	shutdownTimer.Start();
 
-	// Shutdown Winsock system.
-	WinSock_Shutdown();
-
 	// Begin the detour transaction to unhook the process
 	DetourTransactionBegin();
 	DetourUpdateThread(GetCurrentThread());
@@ -418,18 +411,27 @@ void QuerySystemInfo()
 	}
 }
 
-void CheckCPU() // Respawn's engine utilizes POPCNT, SSE3 and SSSE3 (Supplemental SSE 3 Instructions), which is checked in r5apex.exe after we have initialized. We only use up to SSE2.
+void CheckCPU() // Respawn's engine and our SDK utilize POPCNT, SSE3 and SSSE3 (Supplemental SSE 3 Instructions).
 {
-	if (!s_bMathlibInitialized)
+	const CPUInformation& pi = GetCPUInformation();
+	static char szBuf[1024];
+	if (!pi.m_bSSE3)
 	{
-		const CPUInformation& pi = GetCPUInformation();
-		if (!(pi.m_bSSE && pi.m_bSSE2))
-		{
-			if (MessageBoxA(NULL, "SSE and SSE2 are required.", "Unsupported CPU", MB_ICONERROR | MB_OK))
-			{
-				TerminateProcess(GetCurrentProcess(), EXIT_FAILURE);
-			}
-		}
+		V_snprintf(szBuf, sizeof(szBuf), "CPU does not have %s!\n", "SSE 3");
+		MessageBoxA(NULL, szBuf, "Unsupported CPU", MB_ICONERROR | MB_OK);
+		ExitProcess(-1);
+	}
+	if (!pi.m_bSSSE3)
+	{
+		V_snprintf(szBuf, sizeof(szBuf), "CPU does not have %s!\n", "SSSE 3 (Supplemental SSE 3 Instructions)");
+		MessageBoxA(NULL, szBuf, "Unsupported CPU", MB_ICONERROR | MB_OK);
+		ExitProcess(-1);
+	}
+	if (!pi.m_bPOPCNT)
+	{
+		V_snprintf(szBuf, sizeof(szBuf), "CPU does not have %s!\n", "POPCNT");
+		MessageBoxA(NULL, szBuf, "Unsupported CPU", MB_ICONERROR | MB_OK);
+		ExitProcess(-1);
 	}
 }
 
diff --git a/r5dev/tier0/cpu.cpp b/r5dev/tier0/cpu.cpp
index 0de142c8..0a74cdf3 100644
--- a/r5dev/tier0/cpu.cpp
+++ b/r5dev/tier0/cpu.cpp
@@ -469,6 +469,7 @@ const CPUInformation& GetCPUInformation(void)
 		pi.m_bRDTSC = (cpuid1.edx >> 4) & 1;
 		pi.m_bCMOV  = (cpuid1.edx >> 15) & 1;
 		pi.m_bFCMOV = (pi.m_bCMOV && bFPU) ? 1 : 0;
+		pi.m_bPOPCNT= (cpuid1.edx >> 17) & 1;
 		pi.m_bMMX   = (cpuid1.edx >> 23) & 1;
 		pi.m_bSSE   = (cpuid1.edx >> 25) & 1;
 		pi.m_bSSE2  = (cpuid1.edx >> 26) & 1;
diff --git a/r5dev/tier0/platform.h b/r5dev/tier0/platform.h
index 1e49f011..5e9d114d 100644
--- a/r5dev/tier0/platform.h
+++ b/r5dev/tier0/platform.h
@@ -757,6 +757,7 @@ struct CPUInformation
 	bool m_bRDTSC : 1, // Is RDTSC supported?
 		m_bCMOV   : 1, // Is CMOV supported?
 		m_bFCMOV  : 1, // Is FCMOV supported?
+		m_bPOPCNT : 1, // Is POPCNT supported?
 		m_bSSE    : 1, // Is SSE supported?
 		m_bSSE2   : 1, // Is SSE2 Supported?
 		m_b3DNow  : 1, // Is 3DNow! Supported?