[Rendering] WIP on SDLGPU;

Author: LittleCodingFox

BuiltinResources/Hidden/Shaders/Debug/TangentDebug.shader

@@ -2,7 +2,7 @@ Variants BITANGENT_COLOR
 
 Begin Parameters
 
-variant: BITANGENT_COLOR uniform float tangentOrBitangent
+variant: BITANGENT_COLOR float tangentOrBitangent
 
 End Parameters
 

BuiltinResources/Hidden/Shaders/Default/SolidColor.shader

@@ -2,7 +2,7 @@ Type VertexFragment
 
 Begin Parameters
 
-uniform color mainColor
+color mainColor
 
 End Parameters
 

BuiltinResources/Hidden/Shaders/Default/Standard.shader

@@ -6,19 +6,19 @@ Variants VERTEX_COLORS, LIT, HALF_LAMBERT, PER_VERTEX_LIGHTING, NORMALMAP, CUTOU
 
 Begin Parameters
 
-uniform vec3 viewPosition;
-uniform texture ambientOcclusionTexture
-uniform color diffuseColor = #FFFFFFFF
-uniform texture diffuseTexture = WHITE
-uniform texture displacementTexture
-uniform color emissiveColor
-uniform texture emissiveTexture
-uniform texture heightTexture
-variant: NORMALMAP uniform texture normalTexture
-uniform color specularColor
-uniform texture specularTexture
-variant: CUTOUT uniform float cutout
-uniform float alphaThreshold = 0.25
+float3 viewPosition;
+texture ambientOcclusionTexture
+color diffuseColor = #FFFFFFFF
+texture diffuseTexture = WHITE
+texture displacementTexture
+color emissiveColor
+texture emissiveTexture
+texture heightTexture
+variant: NORMALMAP texture normalTexture
+color specularColor
+texture specularTexture
+variant: CUTOUT float cutout
+float alphaThreshold = 0.25
 
 End Parameters
 
@@ -36,7 +36,6 @@ End Instancing
 
 Begin Common
 
-/*
 [[vk::binding(StapleBufferIndexCount, StapleUniformBufferSet)]]
 cbuffer Uniforms
 {
@@ -47,7 +46,6 @@ cbuffer Uniforms
 	float cutout;
 	float alphaThreshold;
 };
-*/
 
 struct VertexOutput
 {

BuiltinResources/Hidden/Shaders/Sprite/Sprite.shader

@@ -4,8 +4,8 @@ Blend SrcAlpha OneMinusSrcAlpha
 
 Begin Parameters
 
-uniform color mainColor
-uniform texture mainTexture
+color mainColor
+texture mainTexture
 
 End Parameters
 

BuiltinResources/Hidden/Shaders/UI/imgui.shader

@@ -3,7 +3,7 @@ Blend SrcAlpha OneMinusSrcAlpha
 
 Begin Parameters
 
-uniform texture mainTexture
+texture mainTexture
 
 End Parameters
 

Engine/Staple.Core/MessagePackGenerated/MessagePackGenerated.cs

@@ -315,11 +315,11 @@ void SetupMaterial()
 
                 lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting);
 
-                var program = material.ShaderProgram;
-
                 var buffer = instance.boneBuffer;
 
-                renderState.program = program;
+                renderState.shader = material.shader;
+
+                renderState.shaderVariant = material.ShaderVariantKey;
 
                 renderState.readOnlyBuffers = [(SkinningBufferIndex, buffer)];
 

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

@@ -75,7 +75,8 @@ public static void RenderGeometry(VertexBuffer vertex, IndexBuffer index,
 
             if(program != null)
             {
-                renderState.program = program;
+                renderState.shader = material.shader;
+                renderState.shaderVariant = material.ShaderVariantKey;
 
                 lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting);
 
@@ -118,13 +119,16 @@ public static void RenderSimple<T>(Span<T> vertices, VertexLayout layout, Span<u
 
             lightSystem?.ApplyMaterialLighting(material, lighting);
 
-            renderState.program = material.ShaderProgram;
+            var program = material.ShaderProgram;
 
-            if (renderState.program == null)
+            if (program == null)
             {
                 return;
             }
 
+            renderState.shader = material.shader;
+            renderState.shaderVariant = material.ShaderVariantKey;
+
             lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting);
 
             RenderSystem.Backend.RenderTransient(vertices, layout, indices, renderState);
@@ -165,13 +169,16 @@ public static void RenderSimple<T>(Span<T> vertices, VertexLayout layout, Span<u
 
             lightSystem?.ApplyMaterialLighting(material, lighting);
 
-            renderState.program = material.ShaderProgram;
+            var program = material.ShaderProgram;
 
-            if (renderState.program == null)
+            if (program == null)
             {
                 return;
             }
 
+            renderState.shader = material.shader;
+            renderState.shaderVariant = material.ShaderVariantKey;
+
             lightSystem?.ApplyLightProperties(material, RenderSystem.CurrentCamera.Item2.Position, lighting);
 
             RenderSystem.Backend.RenderTransient(vertices, layout, indices, renderState);

Engine/Staple.Core/Rendering/Graphics.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
 using System.Runtime.InteropServices;
 
@@ -19,6 +18,23 @@ public struct LightInstance
         public Vector3 padding;
     }
 
+    [StructLayout(LayoutKind.Sequential, Pack = 0)]
+    private struct LightData
+    {
+        public Color ambientColor;
+        public float lightCount;
+        public Vector3 viewPosition;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 0)]
+    private struct LightDetails
+    {
+        public LightType type;
+        public Vector3 position;
+        public Color diffuse;
+        public Color specular;
+    }
+
     /// <summary>
     /// Limit to 16 lights
     /// </summary>
@@ -268,11 +284,11 @@ static bool HandlesValid(Span<ShaderHandle> handles)
         var lightSpotDirectionHandle = handles[6];
         var lightSpotValues = handles[7];
 
-        material.shader.SetVector3(viewPosHandle, cameraPosition);
-        material.shader.SetColor(lightAmbientHandle, lightAmbient);
-        material.shader.SetVector4(lightCountHandle, lightCountValue);
-        material.shader.SetVector4(lightTypePositionHandle, cachedLightTypePositions);
-        material.shader.SetVector4(lightDiffuseHandle, cachedLightDiffuse);
-        material.shader.SetVector4(lightSpotDirectionHandle, cachedLightSpotDirection);
+        material.shader.SetVector3(material.ShaderVariantKey, viewPosHandle, cameraPosition);
+        material.shader.SetColor(material.ShaderVariantKey, lightAmbientHandle, lightAmbient);
+        material.shader.SetVector4(material.ShaderVariantKey, lightCountHandle, lightCountValue);
+        material.shader.SetVector4(material.ShaderVariantKey, lightTypePositionHandle, cachedLightTypePositions);
+        material.shader.SetVector4(material.ShaderVariantKey, lightDiffuseHandle, cachedLightDiffuse);
+        material.shader.SetVector4(material.ShaderVariantKey, lightSpotDirectionHandle, cachedLightSpotDirection);
     }
 }