starred/Memola
1
0
Fork 0
mirror of https://github.com/dscyrescotti/Memola.git synced 2026-04-24 01:28:40 +02:00
Code Issues 5 Packages Projects Releases 3 Wiki Activity

feat: use indexed rendering

Browse Source
This commit is contained in:
dscyrescotti
2024-05-22 22:59:48 +07:00
parent d85f6ff639
commit aa819fcdc9
4 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Memola/Canvas/Geometries/Stroke/Stroke.swift
View File

@@ -56,8 +56,9 @@ final class Stroke: @unchecked Sendable {
let movingAverage = MovingAverage(windowSize: 3) let movingAverage = MovingAverage(windowSize: 3)
var vertexBuffer: MTLBuffer?
var texture: MTLTexture? var texture: MTLTexture?
var indexBuffer: MTLBuffer?
var vertexBuffer: MTLBuffer?
var isEmpty: Bool { var isEmpty: Bool {
quads.isEmpty quads.isEmpty
@@ -160,12 +161,19 @@ extension Stroke: Drawable {
} }
func draw(device: MTLDevice, renderEncoder: MTLRenderCommandEncoder) { func draw(device: MTLDevice, renderEncoder: MTLRenderCommandEncoder) {
guard !isEmpty else { return } guard !isEmpty, let indexBuffer else { return }
prepare(device: device) prepare(device: device)
renderEncoder.setFragmentTexture(texture, index: 0) renderEncoder.setFragmentTexture(texture, index: 0)
renderEncoder.setVertexBuffer(vertexBuffer, offset: 0, index: 0) renderEncoder.setVertexBuffer(vertexBuffer, offset: 0, index: 0)
renderEncoder.drawPrimitives(type: .triangle, vertexStart: 0, vertexCount: quads.endIndex * 6) renderEncoder.drawIndexedPrimitives(
vertexBuffer = nil type: .triangle,
indexCount: quads.endIndex * 6,
indexType: .uint32,
indexBuffer: indexBuffer,
indexBufferOffset: 0
)
self.vertexBuffer = nil
self.indexBuffer = nil
} }
} }

7
Memola/Canvas/RenderPasses/EraserRenderPass.swift
View File

@@ -57,12 +57,15 @@ class EraserRenderPass: RenderPass {
let quadCount = stroke.quads.endIndex let quadCount = stroke.quads.endIndex
var quads = stroke.quads var quads = stroke.quads
let quadBuffer = renderer.device.makeBuffer(bytes: &quads, length: MemoryLayout<Quad>.stride * quadCount, options: []) let quadBuffer = renderer.device.makeBuffer(bytes: &quads, length: MemoryLayout<Quad>.stride * quadCount, options: [])
let vertexBuffer = renderer.device.makeBuffer(length: MemoryLayout<QuadVertex>.stride * quadCount * 6, options: []) let indexBuffer = renderer.device.makeBuffer(length: MemoryLayout<UInt32>.stride * quadCount * 6, options: [])
let vertexBuffer = renderer.device.makeBuffer(length: MemoryLayout<QuadVertex>.stride * quadCount * 4, options: [])
computeEncoder.setComputePipelineState(quadPipelineState) computeEncoder.setComputePipelineState(quadPipelineState)
computeEncoder.setBuffer(quadBuffer, offset: 0, index: 0) computeEncoder.setBuffer(quadBuffer, offset: 0, index: 0)
computeEncoder.setBuffer(vertexBuffer, offset: 0, index: 1) computeEncoder.setBuffer(indexBuffer, offset: 0, index: 1)
computeEncoder.setBuffer(vertexBuffer, offset: 0, index: 2)
stroke.indexBuffer = indexBuffer
stroke.vertexBuffer = vertexBuffer stroke.vertexBuffer = vertexBuffer
let threadsPerGroup = MTLSize(width: 1, height: 1, depth: 1) let threadsPerGroup = MTLSize(width: 1, height: 1, depth: 1)

7
Memola/Canvas/RenderPasses/StrokeRenderPass.swift
View File

@@ -70,12 +70,15 @@ class StrokeRenderPass: RenderPass {
let quadCount = stroke.quads.endIndex let quadCount = stroke.quads.endIndex
var quads = stroke.quads var quads = stroke.quads
let quadBuffer = renderer.device.makeBuffer(bytes: &quads, length: MemoryLayout<Quad>.stride * quadCount, options: []) let quadBuffer = renderer.device.makeBuffer(bytes: &quads, length: MemoryLayout<Quad>.stride * quadCount, options: [])
let vertexBuffer = renderer.device.makeBuffer(length: MemoryLayout<QuadVertex>.stride * quadCount * 6, options: []) let indexBuffer = renderer.device.makeBuffer(length: MemoryLayout<UInt32>.stride * quadCount * 6, options: [])
let vertexBuffer = renderer.device.makeBuffer(length: MemoryLayout<QuadVertex>.stride * quadCount * 4, options: [])
computeEncoder.setComputePipelineState(quadPipelineState) computeEncoder.setComputePipelineState(quadPipelineState)
computeEncoder.setBuffer(quadBuffer, offset: 0, index: 0) computeEncoder.setBuffer(quadBuffer, offset: 0, index: 0)
computeEncoder.setBuffer(vertexBuffer, offset: 0, index: 1) computeEncoder.setBuffer(indexBuffer, offset: 0, index: 1)
computeEncoder.setBuffer(vertexBuffer, offset: 0, index: 2)
stroke.indexBuffer = indexBuffer
stroke.vertexBuffer = vertexBuffer stroke.vertexBuffer = vertexBuffer
let threadsPerGroup = MTLSize(width: 1, height: 1, depth: 1) let threadsPerGroup = MTLSize(width: 1, height: 1, depth: 1)

23
Memola/Canvas/Shaders/Quad.metal
View File

@@ -39,16 +39,23 @@ Vertex createVertex(Quad quad, float2 factor, float2 textCoord) {
kernel void generate_stroke_vertices( kernel void generate_stroke_vertices(
device Quad *quads [[buffer(0)]], device Quad *quads [[buffer(0)]],
device Vertex *vertices [[buffer(1)]], device uint *indices [[buffer(1)]],
device Vertex *vertices [[buffer(2)]],
uint gid [[thread_position_in_grid]] uint gid [[thread_position_in_grid]]
) { ) {
uint index = gid * 6;
Quad quad = quads[gid]; Quad quad = quads[gid];
uint index = gid * 6;
uint vertexIndex = gid * 4;
float halfSize = quad.size * 0.5; float halfSize = quad.size * 0.5;
vertices[index] = createVertex(quad, float2(-halfSize, -halfSize), float2(0, 0)); vertices[vertexIndex] = createVertex(quad, float2(-halfSize, -halfSize), float2(0, 0));
vertices[index + 1] = createVertex(quad, float2(halfSize, -halfSize), float2(1, 0)); vertices[vertexIndex + 1] = createVertex(quad, float2(halfSize, -halfSize), float2(1, 0));
vertices[index + 2] = createVertex(quad, float2(-halfSize, halfSize), float2(0, 1)); vertices[vertexIndex + 2] = createVertex(quad, float2(-halfSize, halfSize), float2(0, 1));
vertices[index + 3] = createVertex(quad, float2(halfSize, -halfSize), float2(1, 0)); vertices[vertexIndex + 3] = createVertex(quad, float2(halfSize, halfSize), float2(1, 1));
vertices[index + 4] = createVertex(quad, float2(-halfSize, halfSize), float2(0, 1));
vertices[index + 5] = createVertex(quad, float2(halfSize, halfSize), float2(1, 1)); indices[index] = vertexIndex;
indices[index + 1] = vertexIndex + 1;
indices[index + 2] = vertexIndex + 2;
indices[index + 3] = vertexIndex + 1;
indices[index + 4] = vertexIndex + 2;
indices[index + 5] = vertexIndex + 3;
} }