Merge pull request #1552 from dpogue/nsprocessinfo

Use metal-cpp's NS::ProcessInfo to get version
H-uru · Jan 9, 2024 · 63026e7 · 63026e7
2 parents 1908290 + 27c4967
commit 63026e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/Sources/Plasma/FeatureLib/pfMetalPipeline/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfMetalPipeline/CMakeLists.txt
@@ -11,6 +11,7 @@ FetchContent_MakeAvailable(metalcpp)
 set(pfMetalPipeline_SOURCES
     plMetalDevice.cpp
     plMetalDeviceRefs.cpp
+    plMetalEnumerate.cpp
     plMetalMaterialShaderRef.cpp
     plMetalPipeline.cpp
     plMetalPipelineState.cpp
@@ -19,7 +20,6 @@ set(pfMetalPipeline_SOURCES
     plMetalFragmentShader.cpp
     plMetalVertexShader.cpp
     plMetalTextFont.cpp
-    plMetalEnumerate.mm
     plMetalDevicePerformanceShaders.mm
 )
 

diff --git a/...reLib/pfMetalPipeline/plMetalEnumerate.mm → ...eLib/pfMetalPipeline/plMetalEnumerate.cpp b/...reLib/pfMetalPipeline/plMetalEnumerate.mm → ...eLib/pfMetalPipeline/plMetalEnumerate.cpp
@@ -44,10 +44,9 @@
 #include "HeadSpin.h"
 
 #include <vector>
+#include <string_theory/format>
+#include <Foundation/Foundation.hpp>
 
-#include <Foundation/Foundation.h>
-
-#include <sys/utsname.h>
 #include "plMetalPipeline.h"
 
 void plMetalEnumerate::Enumerate(std::vector<hsG3DDeviceRecord>& records)
@@ -62,17 +61,11 @@
         devRec.SetG3DDeviceType(hsG3DDeviceSelector::kDevTypeMetal);
         devRec.SetDriverName("Metal");
         devRec.SetDeviceDesc(device->name()->utf8String());
+
         // Metal has ways to query capabilities, but doesn't expose a flat version
         // Populate with the OS version
-        @autoreleasepool {
-            NSProcessInfo*           processInfo = [NSProcessInfo processInfo];
-            NSOperatingSystemVersion version = processInfo.operatingSystemVersion;
-            NSString*                versionString =
-                [NSString stringWithFormat:@"%li.%li.%li", (long)version.majorVersion,
-                                           (long)version.minorVersion, version.patchVersion];
-            devRec.SetDriverVersion([versionString cStringUsingEncoding:NSUTF8StringEncoding]);
-        }
-        devRec.SetDriverDesc(device->name()->utf8String());
+        auto version = NS::ProcessInfo::processInfo()->operatingSystemVersion();
+        devRec.SetDriverVersion(ST::format("{}.{}.{}", version.majorVersion, version.minorVersion, version.patchVersion));
 
         devRec.SetCap(hsG3DDeviceSelector::kCapsMipmap);
         devRec.SetCap(hsG3DDeviceSelector::kCapsPerspective);