[Rendering] WIP improvement of shader input variant handling;

[Rendering] WIP support for storage buffers;

Author: LittleCodingFox

BuiltinResources/Hidden/Shaders/Default/Standard.shader

@@ -26,9 +26,11 @@ Begin Input
 POSITION
 TEXCOORD0
 NORMAL
-TANGENT
-BITANGENT
-COLOR0
+variant: NORMALMAP TANGENT
+variant: NORMALMAP BITANGENT
+variant: VERTEX_COLORS|PER_VERTEX_LIGHTING COLOR0
+variant: SKINNING BLENDINDICES
+variant: SKINNING BLENDWEIGHTS
 End Input
 
 Begin Instancing
@@ -54,9 +56,13 @@ struct VertexOutput
 	float3 lightNormal;
 	float2 coords;
 	float3 normal;
+#ifdef NORMALMAP
 	float3 tangent;
 	float3 bitangent;
+#endif
+#if defined(VERTEX_COLORS) || defined(PER_VERTEX_LIGHTING)
 	float4 color;
+#endif
 	uint instanceID;
 };
 
@@ -69,9 +75,17 @@ struct Input
 	float3 position : POSITION;
 	float2 coords : TEXCOORD0;
 	float3 normal : NORMAL;
+#ifdef NORMALMAP
 	float3 tangent : TANGENT;
 	float3 bitangent : BITANGENT;
+#endif
+#if defined(VERTEX_COLORS) || defined(PER_VERTEX_LIGHTING)
 	float4 color : COLOR0;
+#endif
+#ifdef SKINNING
+	float4 indices : BLENDINDICES;
+	float4 weights : BLENDWEIGHTS;
+#endif
 	uint instanceID : SV_InstanceID;
 };
 
@@ -80,7 +94,11 @@ VertexOutput VertexMain(Input input)
 {
 	VertexOutput output;
 
+#ifdef SKINNING
+	float4x4 model = StapleGetSkinningMatrix(world, input.indices, input.weights);
+#else
 	float4x4 model = world;
+#endif
 
 	float4x4 projectionViewWorld = ProjectionViewWorld(model);
 	float4x4 viewWorld = ViewWorld(model);
@@ -93,8 +111,10 @@ VertexOutput VertexMain(Input input)
 
 	output.coords = input.coords;
 	output.normal = input.normal;
+#ifdef NORMALMAP
 	output.tangent = input.tangent;
 	output.bitangent = input.bitangent;
+#endif
 	output.lightNormal = StapleLightNormal(input.normal, model);
 	output.instanceID = input.instanceID;
 
@@ -110,7 +130,9 @@ VertexOutput VertexMain(Input input)
 	output.color = input.color;
 #endif
 */
+#if defined(VERTEX_COLORS) || defined(PER_VERTEX_LIGHTING)
 	output.color = input.color;
+#endif
 
 	return output;
 }

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

@@ -200,7 +200,7 @@ public void Process(Span<(Entity, Transform, IComponent)> entities, Camera activ
                     .Add(VertexAttribute.TexCoord1, VertexAttributeType.Float4)
                     .Add(VertexAttribute.TexCoord2, VertexAttributeType.Float4)
                     .Add(VertexAttribute.TexCoord3, VertexAttributeType.Float4)
-                    .Build(), RenderBufferFlags.ComputeRead);
+                    .Build(), RenderBufferFlags.GraphicsRead);
             }
 
             instance.transformUpdateTimer += Time.deltaTime;
@@ -323,7 +323,7 @@ void SetupMaterial()
 
                 renderState.shaderVariant = material.ShaderVariantKey;
 
-                renderState.readOnlyBuffers = [(SkinningBufferIndex, buffer)];
+                renderState.storageBuffers = [(SkinningBufferIndex, buffer)];
 
                 RenderSystem.Submit(renderState, renderer.mesh.SubmeshTriangleCount(j), 1);
             }

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

@@ -690,12 +690,12 @@ internal static VertexLayout GetVertexLayout(Mesh mesh)
 
         if(mesh.HasBoneIndices)
         {
-            builder.Add(VertexAttribute.BoneIndices, VertexAttributeType.Float4);
+            builder.Add(VertexAttribute.BlendIndices, VertexAttributeType.Float4);
         }
 
         if(mesh.HasBoneWeights)
         {
-            builder.Add(VertexAttribute.BoneWeight, VertexAttributeType.Float4);
+            builder.Add(VertexAttribute.BlendWeights, VertexAttributeType.Float4);
         }
 
         layout = builder.Build();

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

@@ -32,7 +32,7 @@ void BeginRenderPass(RenderTarget target, CameraClearMode clear, Color clearColo
 
     IShaderProgram CreateShaderVertexFragment(byte[] vertex, byte[] fragment,
         VertexFragmentShaderMetrics vertexMetrics, VertexFragmentShaderMetrics fragmentMetrics,
-        VertexAttribute[] vertexAttributes, ShaderUniformContainer vertexUniforms, ShaderUniformContainer fragmentUniforms);
+        ShaderUniformContainer vertexUniforms, ShaderUniformContainer fragmentUniforms);
 
     IShaderProgram CreateShaderCompute(byte[] compute, ComputeShaderMetrics computeMetrics, ShaderUniformContainer uniforms);
 

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

@@ -74,6 +74,29 @@ state.indexBuffer is not SDLGPUIndexBuffer index ||
             SDL.BindGPUFragmentSamplers(renderPass, 0, samplers, (uint)samplers.Length);
         }
 
+        if((state.storageBuffers?.Length ?? 0) > 0)
+        {
+            var buffers = new List<nint>();
+
+            foreach(var buffer in state.storageBuffers)
+            {
+                if(buffer.Item2 == null ||
+                    buffer.Item2.Flags.HasFlag(RenderBufferFlags.GraphicsRead) == false ||
+                    buffer.Item2.Disposed ||
+                    buffer.Item2 is not SDLGPUVertexBuffer v ||
+                    backend.TryGetVertexBuffer(v.handle, out var resource) == false ||
+                    resource.used == false ||
+                    resource.buffer == nint.Zero)
+                {
+                    continue;
+                }
+
+                buffers.Add(resource.buffer);
+            }
+
+            SDL.BindGPUVertexStorageBuffers(renderPass, 0, buffers.ToArray(), (uint)buffers.Count);
+        }
+
         unsafe
         {
             foreach(var pair in vertexUniformData)

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

@@ -80,6 +80,29 @@ program is not SDLGPUShaderProgram shader ||
             SDL.BindGPUFragmentSamplers(renderPass, 0, samplers, (uint)samplers.Length);
         }
 
+        if ((state.storageBuffers?.Length ?? 0) > 0)
+        {
+            var buffers = new List<nint>();
+
+            foreach (var buffer in state.storageBuffers)
+            {
+                if (buffer.Item2 == null ||
+                    buffer.Item2.Flags.HasFlag(RenderBufferFlags.GraphicsRead) == false ||
+                    buffer.Item2.Disposed ||
+                    buffer.Item2 is not SDLGPUVertexBuffer v ||
+                    backend.TryGetVertexBuffer(v.handle, out var resource) == false ||
+                    resource.used == false ||
+                    resource.buffer == nint.Zero)
+                {
+                    continue;
+                }
+
+                buffers.Add(resource.buffer);
+            }
+
+            SDL.BindGPUVertexStorageBuffers(renderPass, 0, buffers.ToArray(), (uint)buffers.Count);
+        }
+
         unsafe
         {
             foreach (var pair in vertexUniformData)

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

@@ -81,6 +81,29 @@ program is not SDLGPUShaderProgram shader ||
             SDL.BindGPUFragmentSamplers(renderPass, 0, samplers, (uint)samplers.Length);
         }
 
+        if ((state.storageBuffers?.Length ?? 0) > 0)
+        {
+            var buffers = new List<nint>();
+
+            foreach (var buffer in state.storageBuffers)
+            {
+                if (buffer.Item2 == null ||
+                    buffer.Item2.Flags.HasFlag(RenderBufferFlags.GraphicsRead) == false ||
+                    buffer.Item2.Disposed ||
+                    buffer.Item2 is not SDLGPUVertexBuffer v ||
+                    backend.TryGetVertexBuffer(v.handle, out var resource) == false ||
+                    resource.used == false ||
+                    resource.buffer == nint.Zero)
+                {
+                    continue;
+                }
+
+                buffers.Add(resource.buffer);
+            }
+
+            SDL.BindGPUVertexStorageBuffers(renderPass, 0, buffers.ToArray(), (uint)buffers.Count);
+        }
+
         unsafe
         {
             foreach (var pair in vertexUniformData)