Fixing Xcode 11 build. Moves MetalState constructor to its own module…

…, and move intialization to a separate function call
AcademySoftwareFoundation · Feb 26, 2023 · 75583c0 · 75583c0
1 parent b485f68
commit 75583c0
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 28 deletions.
diff --git a/source/MaterialXRenderMsl/MetalState.h b/source/MaterialXRenderMsl/MetalState.h
@@ -34,6 +34,7 @@ struct MetalState
 
     MetalState();
 
+    void initialize(id<MTLDevice> mtlDevice, id<MTLCommandQueue> mtlCmdQueue);
     void initLinearToSRGBKernel();
     void triggerProgrammaticCapture();
     void stopProgrammaticCapture();

diff --git a/source/MaterialXRenderMsl/MetalState.mm b/source/MaterialXRenderMsl/MetalState.mm
@@ -10,6 +10,37 @@
 
 std::unique_ptr<MetalState> MetalState::singleton = nullptr;
 
+MetalState::MetalState()
+{
+}
+
+void MetalState::initialize(id<MTLDevice> mtlDevice, id<MTLCommandQueue> mtlCmdQueue)
+{
+    device = mtlDevice;
+    cmdQueue = mtlCmdQueue;
+
+#if MAC_OS_VERSION_11_0
+    supportsTiledPipeline = [device supportsFamily:MTLGPUFamilyApple4];
+#else
+    supportsTiledPipeline = false;
+#endif
+
+    MTLDepthStencilDescriptor* depthStencilDesc = [MTLDepthStencilDescriptor new];
+    depthStencilDesc.depthWriteEnabled    = true;
+    depthStencilDesc.depthCompareFunction = MTLCompareFunctionLess;
+    opaqueDepthStencilState = [device newDepthStencilStateWithDescriptor:depthStencilDesc];
+
+    depthStencilDesc.depthWriteEnabled    = false;
+    depthStencilDesc.depthCompareFunction = MTLCompareFunctionLess;
+    transparentDepthStencilState = [device newDepthStencilStateWithDescriptor:depthStencilDesc];
+
+    depthStencilDesc.depthWriteEnabled    = true;
+    depthStencilDesc.depthCompareFunction = MTLCompareFunctionAlways;
+    envMapDepthStencilState = [device newDepthStencilStateWithDescriptor:depthStencilDesc];
+
+    initLinearToSRGBKernel();
+}
+
 void MetalState::initLinearToSRGBKernel()
 {
     NSError* error = nil;

diff --git a/source/MaterialXView/ViewerMSL.mm b/source/MaterialXView/ViewerMSL.mm
@@ -49,34 +49,6 @@
 
 using namespace mx;
 
-
-MetalState::MetalState()
-{
-    device = (id<MTLDevice>)ng::metal_device();
-    cmdQueue = (id<MTLCommandQueue>)ng::metal_command_queue();
-
-#if MAC_OS_VERSION_11_0
-    supportsTiledPipeline = [device supportsFamily:MTLGPUFamilyApple4];
-#else
-    supportsTiledPipeline = false;
-#endif
-
-    MTLDepthStencilDescriptor* depthStencilDesc = [MTLDepthStencilDescriptor new];
-    depthStencilDesc.depthWriteEnabled    = true;
-    depthStencilDesc.depthCompareFunction = MTLCompareFunctionLess;
-    opaqueDepthStencilState = [device newDepthStencilStateWithDescriptor:depthStencilDesc];
-
-    depthStencilDesc.depthWriteEnabled    = false;
-    depthStencilDesc.depthCompareFunction = MTLCompareFunctionLess;
-    transparentDepthStencilState = [device newDepthStencilStateWithDescriptor:depthStencilDesc];
-
-    depthStencilDesc.depthWriteEnabled    = true;
-    depthStencilDesc.depthCompareFunction = MTLCompareFunctionAlways;
-    envMapDepthStencilState = [device newDepthStencilStateWithDescriptor:depthStencilDesc];
-
-    initLinearToSRGBKernel();
-}
-
 namespace {
 
 const int ALBEDO_TABLE_SIZE = 128;
@@ -216,6 +188,9 @@ void emitFunctionCall(const  mx::ShaderNode& node, mx::GenContext& context, mx::
     _materialFilename = localSearchPath.find(_materialFilename);
     _meshFilename = localSearchPath.find(_meshFilename);
     _envRadianceFilename = localSearchPath.find(_envRadianceFilename);
+
+    MTL(initialize((id<MTLDevice>)ng::metal_device(),
+                   (id<MTLCommandQueue>)ng::metal_command_queue()));
 
     // Set the requested background color.
     set_background(ng::Color(screenColor[0], screenColor[1], screenColor[2], 1.0f));