fix incorrect viewport depth

This commit is contained in:
a dinosaur 2024-08-09 20:53:30 +10:00
parent 477ce10e68
commit 89780d87d4

View File

@ -45,7 +45,7 @@ class Renderer {
private var device: MTLDevice private var device: MTLDevice
private var layer: CAMetalLayer private var layer: CAMetalLayer
private var viewport = MTLViewport() private var viewport: MTLViewport
private var aspectRatio: Float private var aspectRatio: Float
private var queue: MTLCommandQueue private var queue: MTLCommandQueue
private var lib: MTLLibrary private var lib: MTLLibrary
@ -85,13 +85,7 @@ class Renderer {
} }
self.queue = queue self.queue = queue
self.viewport = MTLViewport( self.viewport = Self.makeViewport(size: size)
originX: 0.0,
originY: 0.0,
width: Double(size.x),
height: Double(size.y),
znear: 1.0,
zfar: -1.0)
self.aspectRatio = Float(size.x) / Float(size.y) self.aspectRatio = Float(size.x) / Float(size.y)
passDescription.colorAttachments[0].loadAction = .clear passDescription.colorAttachments[0].loadAction = .clear
@ -262,6 +256,14 @@ class Renderer {
return depthStencilTexture return depthStencilTexture
} }
static func makeViewport(size: SIMD2<Int>) -> MTLViewport {
MTLViewport(
originX: 0.0, originY: 0.0,
width: Double(size.x),
height: Double(size.y),
znear: 0, zfar: 1)
}
func resize(size: SIMD2<Int>) { func resize(size: SIMD2<Int>) {
if Int(self.viewport.width) != size.x || Int(self.viewport.height) != size.y { if Int(self.viewport.width) != size.x || Int(self.viewport.height) != size.y {
if let depthStencilTexture = Self.createDepthTexture(device, size, format: depthFormat) { if let depthStencilTexture = Self.createDepthTexture(device, size, format: depthFormat) {
@ -271,13 +273,7 @@ class Renderer {
} }
self.aspectRatio = Float(size.x) / Float(size.y) self.aspectRatio = Float(size.x) / Float(size.y)
self.viewport = MTLViewport( self.viewport = Self.makeViewport(size: size)
originX: 0.0,
originY: 0.0,
width: Double(size.x),
height: Double(size.y),
znear: 1.0,
zfar: -1.0)
} }
//FIXME: temp //FIXME: temp
@ -322,7 +318,7 @@ class Renderer {
throw RendererError.drawFailure("Failed to make render encoder from command buffer") throw RendererError.drawFailure("Failed to make render encoder from command buffer")
} }
encoder.setCullMode(.back) encoder.setCullMode(.none)
encoder.setFrontFacing(.counterClockwise) // OpenGL default encoder.setFrontFacing(.counterClockwise) // OpenGL default
encoder.setViewport(viewport) encoder.setViewport(viewport)
encoder.setRenderPipelineState(pso) encoder.setRenderPipelineState(pso)