[Rendering] Fixes to render target handling;

[Rendering] Fixed accidentally removed scissor code from SDL GPU Render Command;

Author: LittleCodingFox

Engine/Staple.Core/Rendering/Animation/SkinnedMeshRenderSystem.cs

@@ -253,11 +253,7 @@ public void Submit()
         var lastLighting = MaterialLighting.Unlit;
         var lastTopology = MeshTopology.Triangles;
 
-        var renderState = new RenderState()
-        {
-            enableDepth = true,
-            depthWrite = true,
-        };
+        var renderState = RenderState.Default;
 
         var l = renderers.Length;
 

Engine/Staple.Core/Rendering/Graphics.cs

@@ -40,19 +40,16 @@ public static void RenderGeometry(VertexBuffer vertex, IndexBuffer index,
                 throw new Exception("Invalid arguments passed");
             }
 
-            var renderState = new RenderState()
-            {
-                cull = material.CullingMode,
-                primitiveType = topology,
-                depthWrite = true,
-                enableDepth = true,
-                indexBuffer = index,
-                vertexBuffer = vertex,
-                startVertex = startVertex,
-                startIndex = startIndex,
-                indexCount = indexCount,
-                world = transform,
-            };
+            var renderState = RenderState.Default;
+
+            renderState.cull = material.CullingMode;
+            renderState.primitiveType = topology;
+            renderState.indexBuffer = index;
+            renderState.vertexBuffer = vertex;
+            renderState.startVertex = startVertex;
+            renderState.startIndex = startIndex;
+            renderState.indexCount = indexCount;
+            renderState.world = transform;
 
             if(materialSetupCallback != null)
             {
@@ -91,11 +88,10 @@ public static void RenderSimple<T>(Span<T> vertices, VertexLayout layout, Span<u
                 throw new Exception("Invalid arguments passed");
             }
 
-            var renderState = new RenderState()
-            {
-                primitiveType = topology,
-                world = transform,
-            };
+            var renderState = RenderState.Default;
+
+            renderState.primitiveType = topology;
+            renderState.world = transform;
 
             if (materialSetupCallback != null)
             {
@@ -134,11 +130,10 @@ public static void RenderSimple<T>(Span<T> vertices, VertexLayout layout, Span<u
                 throw new Exception("Invalid arguments passed");
             }
 
-            var renderState = new RenderState()
-            {
-                primitiveType = topology,
-                world = transform,
-            };
+            var renderState = RenderState.Default;
+
+            renderState.primitiveType = topology;
+            renderState.world = transform;
 
             if (materialSetupCallback != null)
             {

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

@@ -332,17 +332,14 @@ void SetupMaterial()
                     LightSystem.Instance.ApplyMaterialLighting(material, lighting);
                 }
 
-                var renderState = new RenderState()
-                {
-                    cull = material.CullingMode,
-                    primitiveType = mesh.MeshTopology,
-                    depthWrite = true,
-                    enableDepth = true,
-                    indexBuffer = mesh.indexBuffer,
-                    vertexBuffer = mesh.vertexBuffer,
-                    indexCount = mesh.IndexCount,
-                    world = item.transform.Matrix,
-                };
+                var renderState = RenderState.Default;
+
+                renderState.cull = material.CullingMode;
+                renderState.primitiveType = mesh.MeshTopology;
+                renderState.indexBuffer = mesh.indexBuffer;
+                renderState.vertexBuffer = mesh.vertexBuffer;
+                renderState.indexCount = mesh.IndexCount;
+                renderState.world = item.transform.Matrix;
 
                 if (needsChange)
                 {

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

@@ -93,12 +93,9 @@ public static void RenderMesh(Mesh mesh, Vector3 position, Quaternion rotation,
 
         var matrix = Matrix4x4.TRS(position, scale, rotation);
 
-        var renderState = new RenderState()
-        {
-            enableDepth = true,
-            depthWrite = true,
-            world = matrix,
-        };
+        var renderState = RenderState.Default;
+
+        renderState.world = matrix;
 
         mesh.SetActive(ref renderState);
 
@@ -308,11 +305,7 @@ void Add(Material material, int submeshIndex)
 
     public void Submit()
     {
-        var renderState = new RenderState()
-        {
-            depthWrite = true,
-            enableDepth = true,
-        };
+        var renderState = RenderState.Default;
 
         if(instanceBuffer?.Disposed ?? true)
         {

Engine/Staple.Core/Rendering/RenderSystem/Backend/Impls/SDLGPU/Commands/SDLGPURenderCommand.cs

@@ -123,6 +123,22 @@ public void Update()
             }
         }
 
+        if (state.scissor != default)
+        {
+            scissor.X = state.scissor.left;
+            scissor.Y = state.scissor.top;
+            scissor.W = state.scissor.Width;
+            scissor.H = state.scissor.Height;
+        }
+        else
+        {
+            scissor.X = scissor.Y = 0;
+            scissor.W = backend.renderSize.X;
+            scissor.H = backend.renderSize.Y;
+        }
+
+        SDL.SetGPUScissor(renderPass, in scissor);
+
         if (vertexSamplers.IsEmpty == false)
         {
             unsafe

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

@@ -33,6 +33,21 @@ internal struct RenderState
     public int instanceOffset;
     public int instanceCount;
 
+    public static RenderState Default
+    {
+        get
+        {
+            return new()
+            {
+                renderTarget = RenderTarget.Current,
+                vertexStorageBuffers = [],
+                fragmentStorageBuffers = [],
+                enableDepth = true,
+                depthWrite = true,
+            };
+        }
+    }
+
     public readonly RenderState Clone()
     {
         var vertexTextures = this.vertexTextures != null ? new Texture[this.vertexTextures.Length] : null;

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

@@ -139,9 +139,15 @@ public T Get<T>() where T: IRenderSystem
     public static void Render(RenderTarget target, CameraClearMode clearMode, Color clearColor, Vector4 viewport,
         Matrix4x4 cameraTransform, Matrix4x4 projection, Action callback)
     {
+        var previous = RenderTarget.Current;
+
+        RenderTarget.Current = target;
+
         PrepareRender(target, clearMode, clearColor, viewport, cameraTransform, projection);
 
         callback?.Invoke();
+
+        RenderTarget.Current = previous;
     }
 
     /// <summary>
@@ -320,6 +326,11 @@ void Handle(Entity e, Transform t)
 
         foreach (var pair in systemQueues)
         {
+            if(pair.Value.Count == 0)
+            {
+                continue;
+            }
+
             pair.Key.system.Process(CollectionsMarshal.AsSpan(pair.Value), camera, cameraTransform);
 
             pair.Key.system.Submit();
@@ -338,6 +349,8 @@ public void RenderAccumulator(Entity cameraEntity, Camera camera, Transform came
     {
         CurrentCamera = (camera, cameraTransform);
 
+        PrepareCamera(cameraEntity, camera, cameraTransform);
+
         var systems = new List<RenderSystemInfo>();
 
         lock (lockObject)
@@ -400,8 +413,6 @@ public void RenderAccumulator(Entity cameraEntity, Camera camera, Transform came
             }
         }
 
-        PrepareCamera(cameraEntity, camera, cameraTransform);
-
         foreach (var systemInfo in systems)
         {
             systemInfo.system.Submit();