[Rendering] Cleanup and even more ImGui fixes;

Author: LittleCodingFox

Engine/Staple.Core/Rendering/Graphics.cs

@@ -15,7 +15,6 @@ public static class Graphics
         /// <param name="vertex">The vertex buffer</param>
         /// <param name="index">The index buffer</param>
         /// <param name="startVertex">The starting vertex</param>
-        /// <param name="vertexCount">The amount of vertexes to draw</param>
         /// <param name="startIndex">The start index</param>
         /// <param name="indexCount">The amount of indices to draw</param>
         /// <param name="material">The material to use</param>
@@ -25,7 +24,7 @@ public static class Graphics
         /// <param name="viewID">The bgfx view ID to render to</param>
         /// <param name="materialSetupCallback">A callback to setup the material. If it's not set, the default behaviour will be used</param>
         public static void RenderGeometry(VertexBuffer vertex, IndexBuffer index,
-            int startVertex, int vertexCount, int startIndex, int indexCount, Material material,
+            int startVertex, int startIndex, int indexCount, Material material,
             Vector3 position, Matrix4x4 transform, MeshTopology topology, MaterialLighting lighting, ushort viewID,
             Action materialSetupCallback = null)
         {
@@ -35,7 +34,6 @@ public static void RenderGeometry(VertexBuffer vertex, IndexBuffer index,
                 index.Disposed ||
                 startVertex < 0 || 
                 startIndex < 0 ||
-                vertexCount <= 0 ||
                 indexCount <= 0 ||
                 material == null ||
                 material.IsValid == false)
@@ -53,9 +51,7 @@ public static void RenderGeometry(VertexBuffer vertex, IndexBuffer index,
                 vertexBuffer = vertex,
                 startVertex = startVertex,
                 startIndex = startIndex,
-                vertexCount = vertexCount,
                 indexCount = indexCount,
-                vertexLayout = vertex.layout,
                 world = transform,
             };
 

Engine/Staple.Core/Rendering/Mesh/Mesh+Internal.cs

@@ -877,7 +877,6 @@ internal bool SetActive(ref RenderState state, int submeshIndex = 0)
 
         if(submeshes.Count == 0)
         {
-            state.vertexCount = VertexCount;
             state.indexCount = indices.Length;
         }
         else if(submeshIndex >= 0 && submeshIndex < submeshes.Count)
@@ -886,7 +885,6 @@ internal bool SetActive(ref RenderState state, int submeshIndex = 0)
 
             state.startVertex = submesh.startVertex;
             state.startIndex = submesh.startIndex;
-            state.vertexCount = submesh.vertexCount;
             state.indexCount = submesh.indexCount;
         }
         else

Engine/Staple.Core/Rendering/Mesh/MeshCombineSystem.cs

@@ -360,8 +360,6 @@ void SetupMaterial()
                     indexBuffer = mesh.indexBuffer,
                     vertexBuffer = mesh.vertexBuffer,
                     indexCount = mesh.IndexCount,
-                    vertexCount = mesh.VertexCount,
-                    vertexLayout = mesh.vertexBuffer.layout,
                     world = item.transform.Matrix,
                 };
 

Engine/Staple.Core/Rendering/Mesh/MeshRenderSystem.cs

@@ -81,9 +81,7 @@ public static void RenderMesh(Mesh mesh, Vector3 position, Quaternion rotation,
             cull = material.CullingMode,
             indexBuffer = mesh.indexBuffer,
             vertexBuffer = mesh.vertexBuffer,
-            vertexLayout = mesh.vertexBuffer.layout,
             indexCount = mesh.IndexCount,
-            vertexCount = mesh.VertexCount,
             world = matrix,
         };
 
@@ -384,7 +382,6 @@ public void Submit(ushort viewID)
 
                     renderState.vertexBuffer = content.mesh.vertexBuffer;
                     renderState.indexBuffer = content.mesh.indexBuffer;
-                    renderState.vertexLayout = content.mesh.vertexBuffer.layout;
                     renderState.primitiveType = content.mesh.MeshTopology;
                     renderState.world = content.transform.Matrix;
 

Engine/Staple.Core/Rendering/RenderSystem/Backend/Impls/SDLGPU/SDLGPURendererBackend.cs

@@ -513,8 +513,8 @@ public void Render(IRenderPass pass, RenderState state)
         if(pass is not SDLGPURenderPass renderPass ||
             state.program is not SDLGPUShaderProgram shader ||
             shader.Type != ShaderType.VertexFragment ||
-            state.vertexLayout is not SDLGPUVertexLayout vertexLayout ||
             state.vertexBuffer is not SDLGPUVertexBuffer vertex ||
+            vertex.layout is not SDLGPUVertexLayout vertexLayout ||
             state.indexBuffer is not SDLGPUIndexBuffer index)
         {
             return;

Engine/Staple.Core/Rendering/RenderSystem/Backend/RenderState.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Numerics;
 
 namespace Staple.Internal;
@@ -15,10 +14,8 @@ internal struct RenderState
     public VertexBuffer vertexBuffer;
     public IndexBuffer indexBuffer;
     public InstanceBuffer instanceBuffer;
-    public VertexLayout vertexLayout;
     public int startVertex;
     public int startIndex;
-    public int vertexCount;
     public int indexCount;
     public RenderTarget renderTarget;
     public BlendMode sourceBlend;
@@ -39,7 +36,7 @@ internal readonly int StateKey
             hashCode.Add(wireframe);
             hashCode.Add(enableDepth);
             hashCode.Add(depthWrite);
-            hashCode.Add(vertexLayout);
+            hashCode.Add(vertexBuffer?.layout);
             hashCode.Add(renderTarget);
             hashCode.Add(sourceBlend);
             hashCode.Add(destinationBlend);

Engine/Staple.Editor/ImGuiProxy.cs

@@ -635,22 +635,20 @@ private void Render(ImDrawDataPtr drawData)
                             scissor = new(x, (int)(Math.Min(clipRect.Z, 65535.0f) - x), y, (int)(Math.Min(clipRect.W, 65535.0f) - y)),
                             indexBuffer = indexBuffer,
                             vertexBuffer = vertexBuffer,
-                            vertexLayout = layout,
-                            startVertex = currentVertex,
-                            vertexCount = numVertices,
-                            startIndex = currentIndex,
-                            indexCount = numIndices,
+                            startVertex = currentVertex + (int)drawCmd.VtxOffset,
+                            startIndex = currentIndex + (int)drawCmd.IdxOffset,
+                            indexCount = (int)drawCmd.ElemCount,
                             program = program,
                             textures = textures,
                             world = Matrix4x4.Identity,
                         };
 
                         RenderSystem.Submit(pass, state, (int)drawCmd.ElemCount / 3, 1);
                     }
-
-                    currentVertex += numVertices;
-                    currentIndex += numIndices;
                 }
+
+                currentVertex += numVertices;
+                currentIndex += numIndices;
             }
 
             pass.Finish();