[Rendering] Fixes to shader code;

Author: LittleCodingFox

BuiltinResources/Hidden/Shaders/Default/SolidColor.shader

@@ -11,11 +11,6 @@ End Instancing
 
 Begin Common
 
-cbuffer Uniforms
-{
-    float4 mainColor;
-};
-
 struct VertexOutput
 {
     float4 position : SV_Position;
@@ -26,6 +21,12 @@ End Common
 
 Begin Vertex
 
+[[vk::binding(1, StapleUniformBufferSet)]]
+cbuffer Uniforms
+{
+    float4 mainColor;
+};
+
 struct Input
 {
     float3 position : POSITION;

BuiltinResources/Hidden/Shaders/Default/Standard.shader

@@ -27,19 +27,13 @@ End Instancing
 
 Begin Common
 
+[[vk::binding(1, StapleUniformBufferSet)]]
 cbuffer Uniforms
 {
 	float3 viewPosition;
-	Sampler2D ambientOcclusionTexture;
 	float4 diffuseColor;
-	Sampler2D diffuseTexture;
-	Sampler2D displacementTexture;
 	float4 emissiveColor;
-	Sampler2D emissiveTexture;
-	Sampler2D heightTexture;
-	Sampler2D normalTexture;
 	float4 specularColor;
-	Sampler2D specularTexture;
 	float cutout;
 	float alphaThreshold;
 };
@@ -61,8 +55,6 @@ End Common
 
 Begin Vertex
 
-//TODO: Get slang to handle multiple preprocessor conditions
-
 struct Input
 {
 	float3 position : POSITION;
@@ -97,30 +89,43 @@ VertexOutput VertexMain(Input input)
 	output.lightNormal = StapleLightNormal(input.normal, model);
 	output.instanceID = input.instanceID;
 
-//#if LIT && PER_VERTEX_LIGHTING
-	//output.color = float4x4(diffuseColor.rgb * StapleProcessLights(viewPosition, output.worldPosition, input.normal), diffuseColor.a);
+//TODO: handle light array
+/*
+#if defined(LIT) && defined(PER_VERTEX_LIGHTING)
+	output.color = float4x4(diffuseColor.rgb * StapleProcessLights(viewPosition, output.worldPosition, input.normal), diffuseColor.a);
 	
-	//#ifdef VERTEX_COLORS
-//		output.color = input.color * output.color;
-//	#endif
-//#else
+	#ifdef VERTEX_COLORS
+		output.color = input.color * output.color;
+	#endif
+#else
+	output.color = input.color;
+#endif
+*/
 	output.color = input.color;
-//#endif
 
 	return output;
 }
 End Vertex
 
 Begin Fragment
 
+[[vk::binding(0, StapleSamplerBufferSet)]]
+cbuffer Textures
+{
+	Sampler2D diffuseTexture;
+#ifdef NORMALMAP
+	Sampler2D normalTexture;
+#endif
+};
+
 [shader("fragment")]
 float4 FragmentMain(VertexOutput input) : SV_Target
 {
-//#if VERTEX_COLORS || PER_VERTEX_LIGHTING
-//	float4 diffuse = input.color * diffuseColor;
-//#else
+#if defined(VERTEX_COLORS) || defined(PER_VERTEX_LIGHTING)
+	float4 diffuse = input.color * diffuseColor;
+#else
 	float4 diffuse = diffuseTexture.Sample(input.coords) * diffuseColor;
-//#endif
+#endif
 
 #ifdef CUTOUT
 	if(diffuse.a < alphaThreshold)
@@ -129,26 +134,28 @@ float4 FragmentMain(VertexOutput input) : SV_Target
 	}
 #endif
 
-//#if LIT && PER_VERTEX_LIGHTING
-	return diffuse;
+//TODO: handle light array
 /*
-#elif LIT
+#if defined(LIT) && defined(PER_VERTEX_LIGHTING)
+	return diffuse;
+#elif defined(LIT)
 
-#if NORMALMAP
+#ifdef NORMALMAP
 	float3x3 tbn = float3x3(normalize(input.tangent), normalize(input.bitangent), normalize(input.normal));
 
 	float3 normalMapNormal = normalize(normalTexture.Sample(v_texcoord0).xyz * 2.0 - 1.0);
 
 	float3 light = StapleProcessLightsTangent(viewPosition, input.worldPosition, normalMapNormal, tbn);
 #else
-	float3 light = StapleProcessLights(viewPosition, input.world, input.lightNormal);
+	float3 light = StapleProcessLights(viewPosition, input.worldPosition, input.lightNormal);
 #endif
 
 	return float4(light, 1) * diffuse;
+#else
+	return diffuse;
+#endif
 */
-//#else
-	//return diffuse;
-//#endif
+	return diffuse;
 }
 
 End Fragment

BuiltinResources/Hidden/Shaders/Sprite/Sprite.shader

@@ -11,10 +11,10 @@ End Parameters
 
 Begin Common
 
+[[vk::binding(1, StapleUniformBufferSet)]]
 cbuffer Uniforms
 {
 	float4 mainColor;
-	Sampler2D mainTexture;
 };
 
 struct VertexOutput
@@ -53,6 +53,12 @@ End Vertex
 
 Begin Fragment
 
+[[vk::binding(0, StapleSamplerBufferSet)]]
+cbuffer Textures
+{
+	Sampler2D mainTexture;
+};
+
 [shader("fragment")]
 float4 FragmentMain(VertexOutput input) : SV_Target
 {

BuiltinResources/Hidden/Shaders/UI/imgui.shader

@@ -51,7 +51,7 @@ End Vertex
 
 Begin Fragment
 
-[[vk::binding(0, 2)]]
+[[vk::binding(0, StapleSamplerBufferSet)]]
 cbuffer Uniforms
 {
 	Sampler2D mainTexture;

Tools/ShaderIncludes/Staple.slang

@@ -3,16 +3,26 @@ module Staple;
 __include StapleMath;
 __include StapleLighting;
 
-#define STAPLE_SKINNING_STAGE_INDEX 15
-#define STAPLE_LIGHTING_NORMAL_MATRIX_STAGE_INDEX 14
+#define STAPLE_SKINNING_STAGE_INDEX 14
+#define STAPLE_LIGHTING_NORMAL_MATRIX_STAGE_INDEX 13
 
 #ifdef STAPLE_VERTEX_SHADER
-[[vk::binding(0, 1)]]
+public static const int StapleSamplerBufferSet = 0;
+public static const int StapleUniformBufferSet = 1;
+#elif defined(STAPLE_FRAGMENT_SHADER)
+public static const int StapleSamplerBufferSet = 2;
+public static const int StapleUniformBufferSet = 3;
+#elif defined(STAPLE_COMPUTE_SHADER)
+public static const int StapleSamplerBufferSet = 0;
+public static const int StapleReadWriteBufferSet = 1;
+public static const int StapleUniformBufferSet = 2;
+#else
+public static const int StapleSamplerBufferSet = 0;
+public static const int StapleReadWriteBufferSet = 0;
+public static const int StapleUniformBufferSet = 0;
 #endif
 
-#ifdef STAPLE_FRAGMENT_SHADER
-[[vk::binding(0, 3)]]
-#endif
+[[vk::binding(0, StapleUniformBufferSet)]]
 public cbuffer StapleRenderData
 {
     public float4x4 world;
@@ -21,13 +31,5 @@ public cbuffer StapleRenderData
     public float time;
 };
 
-#ifdef SKINNING
-#   ifdef STAPLE_VERTEX_SHADER
-[[vk::binding(STAPLE_SKINNING_STAGE_INDEX, 1)]]
-#   endif
-
-#   ifdef STAPLE_FRAGMENT_SHADER
-[[vk::binding(STAPLE_SKINNING_STAGE_INDEX, 3)]]
-#   endif
+[[vk::binding(STAPLE_SKINNING_STAGE_INDEX, StapleUniformBufferSet)]]
 public StructuredBuffer<float4> StapleBoneMatrices;
-#endif