TriangleStrip batching

TeuriaGames · Jan 21, 2025 · 34482e0 · 34482e0
1 parent 8081d1f
commit 34482e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Riateu/Core/GameContext.cs b/Riateu/Core/GameContext.cs
@@ -61,7 +61,7 @@ internal static void Init(GraphicsDevice device, Window mainWindow)
             ))
             .SetDepthStenctilState(DepthStencilState.DepthReadWrite)
             .SetMultisampleState(MultisampleState.None)
-            .SetPrimitiveType(PrimitiveType.TriangleList)
+            .SetPrimitiveType(PrimitiveType.TriangleStrip)
             .SetRasterizerState(RasterizerState.CCW_CullNone)
 
             .Build(device)

diff --git a/Riateu/Core/Graphics/Batch.cs b/Riateu/Core/Graphics/Batch.cs
@@ -226,7 +226,7 @@ public void Render(RenderPass renderPass)
             renderPass.BindStorageVertexBuffer(batchBuffer);
             renderPass.BindFragmentSampler(start.Binding);
             start.Material.BindUniforms(new UniformBinder());
-            renderPass.DrawPrimitives(start.Count * 6u, 1, start.Offset * 6);
+            renderPass.DrawPrimitives(4, start.Count, 0, start.Offset);
 
             start = ref Unsafe.Add(ref start, 1);
         }

diff --git a/Riateu/Core/Misc/Compiled/Spritebatch.vert.spv b/Riateu/Core/Misc/Compiled/Spritebatch.vert.spv
diff --git a/Riateu/Core/Misc/Shaders/Spritebatch.vert.slang b/Riateu/Core/Misc/Shaders/Spritebatch.vert.slang
@@ -33,15 +33,14 @@ static const float2 vertices[4] = {
     { 0.0f, 1.0f },
     { 1.0f, 1.0f },
 };
-static const uint indices[6] = { 0, 1, 2, 2, 1, 3 };
 
 [shader("vertex")]
-VertexOutput main(uint id: SV_VertexID) 
+VertexOutput main(uint id: SV_VertexID, uint instanceID: SV_InstanceID) 
 {
-    uint spriteIndex = id / 6;
-    SpriteBatchData sprite = BatchDataBuffer[spriteIndex];
+    uint spriteIndex = id / 4;
+    SpriteBatchData sprite = BatchDataBuffer[instanceID];
 
-    uint vert = indices[id - spriteIndex * 6];
+    uint vert = id - spriteIndex * 4;
 
     float c = cos(sprite.Rotation);
     float s = sin(sprite.Rotation);