Stencil and transparent geo fixes

flyinghead · Jan 9, 2025 · e51c9b3 · e51c9b3
1 parent 1bcef07
commit e51c9b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/core/rend/metal/metal_pipeline.cpp b/core/rend/metal/metal_pipeline.cpp
@@ -301,20 +301,20 @@ void MetalPipelineManager::CreateDepthStencilState(u32 listType, bool sortTriang
     stencilDescriptor->setStencilFailureOperation(MTL::StencilOperationKeep);
     stencilDescriptor->setDepthFailureOperation(MTL::StencilOperationKeep);
 
+    if (shadowed) {
+        stencilDescriptor->setDepthStencilPassOperation(MTL::StencilOperationReplace);
         stencilDescriptor->setStencilCompareFunction(MTL::CompareFunctionAlways);
         stencilDescriptor->setReadMask(0);
         stencilDescriptor->setWriteMask(0x80);
-    } else {
-        stencilDescriptor->setStencilFailureOperation(MTL::StencilOperationKeep);
-        stencilDescriptor->setDepthFailureOperation(MTL::StencilOperationKeep);
-        stencilDescriptor->setDepthStencilPassOperation(MTL::StencilOperationKeep);
-        stencilDescriptor->setStencilCompareFunction(MTL::CompareFunctionNever);
     }
 
     descriptor->setDepthCompareFunction(compareFunction);
     descriptor->setDepthWriteEnabled(depthWriteEnabled);
-    descriptor->setBackFaceStencil(stencilDescriptor);
-    descriptor->setFrontFaceStencil(stencilDescriptor);
+
+    if (shadowed) {
+        descriptor->setBackFaceStencil(stencilDescriptor);
+        descriptor->setFrontFaceStencil(stencilDescriptor);
+    }
 
     auto state = MetalContext::Instance()->GetDevice()->newDepthStencilState(descriptor);
 

diff --git a/core/rend/metal/metal_renderer.cpp b/core/rend/metal/metal_renderer.cpp
@@ -204,6 +204,8 @@ void MetalRenderer::SetBaseScissor(MTL::Viewport viewport) {
 
 void MetalRenderer::DrawPoly(MTL::RenderCommandEncoder *encoder, u32 listType, bool sortTriangles, const PolyParam &poly, u32 first, u32 count)
 {
+    encoder->setVertexBuffer(curMainBuffer, offsets.vertexUniformOffset, 0);
+
     MTL::ScissorRect scissorRect {};
     TileClipping tileClip = SetTileClip(encoder, poly.tileclip, scissorRect);
 
@@ -533,7 +535,6 @@ bool MetalRenderer::Draw(const MetalTexture *fogTexture, const MetalTexture *pal
 
     UploadMainBuffer(vtxUniforms, fragUniforms);
 
-    renderEncoder->setVertexBuffer(curMainBuffer, offsets.vertexUniformOffset, 0);
     renderEncoder->setVertexBuffer(curMainBuffer, 0, 30);
     renderEncoder->setFragmentBuffer(curMainBuffer, offsets.fragmentUniformOffset, 0);