cleanup

Author: azer89

Shaders/ShadowMapping/Scene.frag

@@ -124,37 +124,23 @@ void main()
 		ao,
 		NoV);
 
-	uint cascadeIndex = 0;
-	for (uint i = 0; i < SHADOW_MAP_CASCADE_COUNT - 1; ++i)
-	{
-		if (viewPos.z < shadowUBO.splitDepths[i])
-		{
-			cascadeIndex = i + 1;
-		}
-	}
+
+	// Obtaining the cascadeIndex below is optimized for SHADOW_MAP_CASCADE_COUNT = 4
+	vec4 res = step(viewPos.z, shadowUBO.splitDepths);
+	uint cascadeIndex = uint(res.x + res.y + res.z + res.w);
 
 	vec4 shadowPos = biasMat * shadowUBO.lightSpaceMatrices[cascadeIndex] * vec4(worldPos, 1.0);
 
 	float shadow = ShadowPCF(shadowPos / shadowPos.w, cascadeIndex);
-
 	vec3 color = ambient + emissive + (Lo * shadow);
-	//vec3 color = ambient + emissive + (Lo);
-
 	fragColor = vec4(color, 1.0);
 
-	/*switch (cascadeIndex)
+	// For debugging
+	switch (cascadeIndex)
 	{
-		case 0:
-			fragColor.rgb *= vec3(1.0f, 0.25f, 0.25f);
-			break;
-		case 1:
-			fragColor.rgb *= vec3(0.25f, 1.0f, 0.25f);
-			break;
-		case 2:
-			fragColor.rgb *= vec3(0.25f, 0.25f, 1.0f);
-			break;
-		case 3:
-			fragColor.rgb *= vec3(1.0f, 0.25f, 0.25f);
-			break;
-	}*/
+		case 0: fragColor.rgb *= vec3(1.0f, 0.25f, 0.25f); break;
+		case 1: fragColor.rgb *= vec3(0.25f, 1.0f, 0.25f); break;
+		case 2: fragColor.rgb *= vec3(0.25f, 0.25f, 1.0f); break;
+		case 3: fragColor.rgb *= vec3(1.0f, 0.25f, 0.25f); break;
+	}
 }

Shaders/ShadowMapping/UBO.glsl

@@ -1,4 +1,3 @@
-// TODO Use specialization constant
 #define SHADOW_MAP_CASCADE_COUNT 4
 
 struct ShadowUBO