Merge branch 'master' into vulkan

Former-commit-id: c8f084d159de392aaa6c11354667fe777057a631 [formerly 3ce2308741fdfea19b6564d5ed4bb9e1e36b87cf] Former-commit-id: 43e39f71cd5ae1fd28f02308956361c2a7580e9d
2016-06-03 12:45:28 +02:00
parent b9b5db734c 48a7ba0114
commit c45cb6bb12
5 changed files with 6 additions and 4 deletions
--- a/src/Nazara/Graphics/Resources/Shaders/Basic/core.vert.h
+++ b/src/Nazara/Graphics/Resources/Shaders/Basic/core.vert.h
--- a/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag
+++ b/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()
 {
--- a/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag.h
+++ b/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.frag.h
--- a/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h
+++ b/src/Nazara/Graphics/Resources/Shaders/PhongLighting/core.vert.h