xrCore,xrCDB: replace cpu features on SDL

OpenXRay · Aug 2, 2018 · ac669b5 · ac669b5
1 parent bbf2b50
commit ac669b5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/src/xrCDB/ISpatial_q_ray.cpp b/src/xrCDB/ISpatial_q_ray.cpp
@@ -335,7 +335,7 @@ void ISpatial_DB::q_ray(
     Stats.Query.Begin();
     q_result = &R;
     q_result->clear();
-    if (CPU::ID.hasFeature(CpuFeature::Sse))
+    if (SDL_HasSSE())
     {
         if (_o & O_ONLYFIRST)
         {

diff --git a/src/xrCDB/xrCDB_ray.cpp b/src/xrCDB/xrCDB_ray.cpp
@@ -424,7 +424,7 @@ void COLLIDER::ray_query(const MODEL* m_def, const Fvector& r_start, const Fvect
     const AABBNoLeafNode* N = T->GetNodes();
     r_clear();
 
-    if (CPU::ID.hasFeature(CpuFeature::Sse))
+    if (SDL_HasSSE())
     {
         // SSE
         // Binary dispatcher

diff --git a/src/xrCore/_math.cpp b/src/xrCore/_math.cpp
@@ -23,6 +23,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <chrono>
+#include <thread>
 #endif
 
 typedef struct _PROCESSOR_POWER_INFORMATION
@@ -73,11 +74,13 @@ void QueryPerformanceCounter(PLARGE_INTEGER result)
 
 DWORD timeGetTime()
 {
-    std::chrono::time_point<std::chrono::high_resolution_clock> now = std::chrono::high_resolution_clock::now();
+ /*   std::chrono::time_point<std::chrono::high_resolution_clock> now = std::chrono::high_resolution_clock::now();
 
     auto nanosec = now.time_since_epoch();
 
     return nanosec.count()/(1000000000.0 *60.0 *60.0);
+    */
+    return SDL_GetTicks();
 }
 
 #endif
@@ -305,30 +308,22 @@ bool g_initialize_cpu_called = false;
 //------------------------------------------------------------------------------------
 void _initialize_cpu()
 {
-    // General CPU identification
-    if (!query_processor_info(&CPU::ID))
-        FATAL("Can't detect CPU/FPU.");
 
     CPU::Detect();
 
-    Msg("* Detected CPU: %s [%s], F%d/M%d/S%d, 'rdtsc'", CPU::ID.modelName,
-        +CPU::ID.vendor, CPU::ID.family, CPU::ID.model, CPU::ID.stepping);
-
     string256 features;
     xr_strcpy(features, sizeof(features), "RDTSC");
-    if (CPU::ID.hasFeature(CpuFeature::Mmx)) xr_strcat(features, ", MMX");
-    if (CPU::ID.hasFeature(CpuFeature::_3dNow)) xr_strcat(features, ", 3DNow!");
-    if (CPU::ID.hasFeature(CpuFeature::Sse)) xr_strcat(features, ", SSE");
-    if (CPU::ID.hasFeature(CpuFeature::Sse2)) xr_strcat(features, ", SSE2");
-    if (CPU::ID.hasFeature(CpuFeature::Sse3)) xr_strcat(features, ", SSE3");
-    if (CPU::ID.hasFeature(CpuFeature::MWait)) xr_strcat(features, ", MONITOR/MWAIT");
-    if (CPU::ID.hasFeature(CpuFeature::Ssse3)) xr_strcat(features, ", SSSE3");
-    if (CPU::ID.hasFeature(CpuFeature::Sse41)) xr_strcat(features, ", SSE4.1");
-    if (CPU::ID.hasFeature(CpuFeature::Sse42)) xr_strcat(features, ", SSE4.2");
-    if (CPU::ID.hasFeature(CpuFeature::HT)) xr_strcat(features, ", HTT");
+    if (SDL_HasMMX()) xr_strcat(features, ", MMX");
+    if (SDL_Has3DNow()) xr_strcat(features, ", 3DNow!");
+    if (SDL_HasSSE()) xr_strcat(features, ", SSE");
+    if (SDL_HasSSE2()) xr_strcat(features, ", SSE2");
+    if (SDL_HasSSE3()) xr_strcat(features, ", SSE3");
+    if (SDL_HasRDTSC()) xr_strcat(features, ", RDTSC");
+    if (SDL_HasSSE41()) xr_strcat(features, ", SSE4.1");
+    if (SDL_HasSSE42()) xr_strcat(features, ", SSE4.2");
 
     Msg("* CPU features: %s", features);
-    Msg("* CPU cores/threads: %d/%d", CPU::ID.n_cores, CPU::ID.n_threads);
+    Msg("* CPU cores/threads: %d/%d", std::thread::hardware_concurrency(), SDL_GetCPUCount());
 
 #if defined(WINDOWS)
     SYSTEM_INFO sysInfo;
@@ -378,7 +373,7 @@ void _initialize_cpu_thread()
     else
         FPU::m24r();
 
-    if (CPU::ID.hasFeature(CpuFeature::Sse))
+    if (SDL_HasSSE())
     {
         //_mm_setcsr ( _mm_getcsr() | (_MM_FLUSH_ZERO_ON+_MM_DENORMALS_ZERO_ON) );
         _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);

diff --git a/src/xrCore/xrCore.cpp b/src/xrCore/xrCore.cpp
@@ -75,7 +75,7 @@ void xrCore::Initialize(pcstr _ApplicationName, LogCallback cb, bool init_fs, pc
         Msg("%s %s build %d, %s\n", "OpenXRay", GetBuildConfiguration(), buildId, buildDate);
         Msg("command line %s\n", Params);
         _initialize_cpu();
-        R_ASSERT(CPU::ID.hasFeature(CpuFeature::Sse));
+        R_ASSERT(SDL_HasSSE());
         ttapi.initialize();
         XRay::Math::Initialize();
         // xrDebug::Initialize ();