Browse Source

Merge pull request #28723 from SouzaGuilherme/fix_shadows

Fix SHADOWS_DISABLED flag in GLES2
Rémi Verschelde 6 years ago
parent
commit
a0a5047cfd
1 changed files with 12 additions and 0 deletions
  1. 12 0
      drivers/gles2/shaders/scene.glsl

+ 12 - 0
drivers/gles2/shaders/scene.glsl

@@ -1699,6 +1699,8 @@ FRAGMENT_SHADER_CODE
 
 
 #endif
 #endif
 
 
+#if !defined(SHADOWS_DISABLED)
+
 #ifdef USE_SHADOW
 #ifdef USE_SHADOW
 	{
 	{
 		highp vec4 splane = shadow_coord;
 		highp vec4 splane = shadow_coord;
@@ -1729,6 +1731,8 @@ FRAGMENT_SHADER_CODE
 	}
 	}
 #endif
 #endif
 
 
+#endif //SHADOWS_DISABLED
+
 #endif //type omni
 #endif //type omni
 
 
 #ifdef LIGHT_MODE_DIRECTIONAL
 #ifdef LIGHT_MODE_DIRECTIONAL
@@ -1739,6 +1743,8 @@ FRAGMENT_SHADER_CODE
 #endif
 #endif
 	float depth_z = -vertex.z;
 	float depth_z = -vertex.z;
 
 
+#if !defined(SHADOWS_DISABLED)
+
 #ifdef USE_SHADOW
 #ifdef USE_SHADOW
 
 
 #ifdef USE_VERTEX_LIGHTING
 #ifdef USE_VERTEX_LIGHTING
@@ -1957,6 +1963,8 @@ FRAGMENT_SHADER_CODE
 
 
 #endif //use shadow
 #endif //use shadow
 
 
+#endif // SHADOWS_DISABLED
+
 #endif
 #endif
 
 
 #ifdef LIGHT_MODE_SPOT
 #ifdef LIGHT_MODE_SPOT
@@ -1993,6 +2001,8 @@ FRAGMENT_SHADER_CODE
 
 
 #endif
 #endif
 
 
+#if !defined(SHADOWS_DISABLED)
+
 #ifdef USE_SHADOW
 #ifdef USE_SHADOW
 	{
 	{
 		highp vec4 splane = shadow_coord;
 		highp vec4 splane = shadow_coord;
@@ -2002,6 +2012,8 @@ FRAGMENT_SHADER_CODE
 	}
 	}
 #endif
 #endif
 
 
+#endif // SHADOWS_DISABLED
+
 #endif // LIGHT_MODE_SPOT
 #endif // LIGHT_MODE_SPOT
 
 
 #ifdef USE_VERTEX_LIGHTING
 #ifdef USE_VERTEX_LIGHTING