Merge branch 'master' into vulkan

Former-commit-id: c8f084d159de392aaa6c11354667fe777057a631 [formerly 3ce2308741fdfea19b6564d5ed4bb9e1e36b87cf]
Former-commit-id: 43e39f71cd5ae1fd28f02308956361c2a7580e9d

include/Nazara/Utility/PixelFormat.inl

@@ -156,7 +156,7 @@ namespace Nz
 				case PixelFormatType_DXT1:
 				case PixelFormatType_DXT3:
 				case PixelFormatType_DXT5:
-					return (((width + 3) / 4) * ((height + 3) / 4) * (format == PixelFormatType_DXT1) ? 8 : 16) * depth;
+					return (((width + 3) / 4) * ((height + 3) / 4) * ((format == PixelFormatType_DXT1) ? 8 : 16)) * depth;
 
 				default:
 					NazaraError("Unsupported format");

src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag

@@ -94,6 +94,7 @@ float VectorToDepthValue(vec3 vec, float zNear, float zFar)
 	return (normZ + 1.0) * 0.5;
 }
 
+#if SHADOW_MAPPING
 float CalculateDirectionalShadowFactor(int lightIndex)
 {
 	vec4 lightSpacePos = vLightSpacePos[lightIndex];
@@ -119,6 +120,7 @@ float CalculateSpotShadowFactor(int lightIndex)
 	
 	return visibility;
 }
+#endif
 
 void main()
 {