[Metal] Fixed caching of compute PSO in MTCommandContext.

- Compute PSO was not reset in ResetComputeEncoderState(). - Also fixed Mapping example for Metal backend.
LukasBanana · Jun 6, 2024 · 151580e · 151580e
1 parent e964264
commit 151580e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/examples/Cpp/Mapping/Example.cpp b/examples/Cpp/Mapping/Example.cpp
@@ -127,10 +127,11 @@ class Example_Mapping : public ExampleBase
         // Create graphics pipeline
         LLGL::GraphicsPipelineDescriptor pipelineDesc;
         {
-            pipelineDesc.vertexShader       = shaderPipeline.vs;
-            pipelineDesc.fragmentShader     = shaderPipeline.ps;
-            pipelineDesc.pipelineLayout     = pipelineLayout;
-            pipelineDesc.primitiveTopology  = LLGL::PrimitiveTopology::TriangleStrip;
+            pipelineDesc.vertexShader                   = shaderPipeline.vs;
+            pipelineDesc.fragmentShader                 = shaderPipeline.ps;
+            pipelineDesc.pipelineLayout                 = pipelineLayout;
+            pipelineDesc.primitiveTopology              = LLGL::PrimitiveTopology::TriangleStrip;
+            pipelineDesc.rasterizer.multiSampleEnabled  = (GetSampleCount() > 1);
         }
         pipeline = renderer->CreatePipelineState(pipelineDesc);
     }

diff --git a/sources/Renderer/Metal/Command/MTCommandContext.mm b/sources/Renderer/Metal/Command/MTCommandContext.mm
@@ -664,7 +664,8 @@ static NSUInteger GetTessFactorSizeForPatchType(const MTLPatchType patchType)
 
 void MTCommandContext::ResetComputeEncoderState()
 {
-    computeEncoderState_.computeResourceHeap = nullptr;
+    computeEncoderState_.computePSO             = nullptr;
+    computeEncoderState_.computeResourceHeap    = nullptr;
 }
 
 void MTCommandContext::ResetContextState()