[Rendering] Minor tweaks to shaders and render state;

Author: LittleCodingFox

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

@@ -18,6 +18,7 @@ internal struct RenderState
     public InstanceBuffer instanceBuffer;
     public (int, VertexBuffer)[] readOnlyBuffers;
     public (int, VertexBuffer)[] readWriteBuffers;
+    public (int, VertexBuffer)[] writeOnlyBuffers;
     public int startVertex;
     public int startIndex;
     public int indexCount;
@@ -60,21 +61,29 @@ internal readonly int StateKey
                 }
             }
 
+            if (writeOnlyBuffers != null)
+            {
+                foreach (var t in writeOnlyBuffers)
+                {
+                    hashCode.Add(t);
+                }
+            }
+
             if (textures != null)
             {
                 foreach(var t in textures)
                 {
-                    hashCode.Add(t.GetHashCode());
+                    hashCode.Add(t);
                 }
             }
 
-            if(renderTarget != null && renderTarget.Disposed == false)
+            if((renderTarget?.Disposed ?? true) == false)
             {
                 for(var i = 0; i < renderTarget.ColorTextureCount; i++)
                 {
                     var texture = renderTarget.GetColorTexture(i);
 
-                    if(texture == null || texture.Disposed || texture.impl is not SDLGPUTexture t)
+                    if((texture?.Disposed ?? true) || texture.impl is not SDLGPUTexture t)
                     {
                         continue;
                     }
@@ -83,8 +92,7 @@ internal readonly int StateKey
                 }
 
                 {
-                    if (renderTarget.DepthTexture != null &&
-                        renderTarget.DepthTexture.Disposed == false &&
+                    if ((renderTarget.DepthTexture?.Disposed ?? true) == false &&
                         renderTarget.DepthTexture.impl is SDLGPUTexture t)
                     {
                         hashCode.Add(t.handle);

Engine/Staple.Core/Rendering/Shader/Shader.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Numerics;
 using System.Runtime.CompilerServices;
@@ -374,9 +375,26 @@ internal static bool CanStoreUniformData((int, byte[]) data, int size)
         return data.Item1 >= 0 && data.Item1 + size <= data.Item2.Length;
     }
 
+    private static void SetValueInternal(Span<byte> source, (int, byte[])? vertexData, (int, byte[])? fragmentData)
+    {
+        if (vertexData != null && CanStoreUniformData(vertexData.Value, source.Length))
+        {
+            var target = new Span<byte>(vertexData.Value.Item2, vertexData.Value.Item1, source.Length);
+
+            source.CopyTo(target);
+        }
+
+        if (fragmentData != null && CanStoreUniformData(fragmentData.Value, source.Length))
+        {
+            var target = new Span<byte>(fragmentData.Value.Item2, fragmentData.Value.Item1, source.Length);
+
+            source.CopyTo(target);
+        }
+    }
+
     private void SetValue<T>(string variantKey, ShaderHandle handle, T value) where T: unmanaged
     {
-        if (TryGetUniformData(variantKey, handle, out var uniform, out var vertexData, out var fragmentData) == false)
+        if (TryGetUniformData(variantKey, handle, out _, out var vertexData, out var fragmentData) == false)
         {
             return;
         }
@@ -387,19 +405,7 @@ private void SetValue<T>(string variantKey, ShaderHandle handle, T value) where
         {
             var source = new Span<byte>(&value, size);
 
-            if (vertexData != null && CanStoreUniformData(vertexData.Value, size))
-            {
-                var target = new Span<byte>(vertexData.Value.Item2, vertexData.Value.Item1, size);
-
-                source.CopyTo(target);
-            }
-
-            if (fragmentData != null && CanStoreUniformData(fragmentData.Value, size))
-            {
-                var target = new Span<byte>(fragmentData.Value.Item2, fragmentData.Value.Item1, size);
-
-                source.CopyTo(target);
-            }
+            SetValueInternal(source, vertexData, fragmentData);
         }
     }
 
@@ -418,19 +424,7 @@ private void SetValue<T>(string variantKey, ShaderHandle handle, ReadOnlySpan<T>
                 var size = Marshal.SizeOf<T>() * count;
                 var source = new Span<byte>(ptr, size);
 
-                if (vertexData != null && CanStoreUniformData(vertexData.Value, size))
-                {
-                    var target = new Span<byte>(vertexData.Value.Item2, vertexData.Value.Item1, size);
-
-                    source.CopyTo(target);
-                }
-
-                if (fragmentData != null && CanStoreUniformData(fragmentData.Value, size))
-                {
-                    var target = new Span<byte>(fragmentData.Value.Item2, fragmentData.Value.Item1, size);
-
-                    source.CopyTo(target);
-                }
+                SetValueInternal(source, vertexData, fragmentData);
             }
         }
     }