Merge pull request #29141 from clayjohn/gles2-fog

Do not compute fog when using unshaded in GLES2
This commit is contained in:
Rémi Verschelde 2019-05-24 12:22:01 +02:00 committed by GitHub
commit eaff86f8bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2133,8 +2133,6 @@ FRAGMENT_SHADER_CODE
#endif
// gl_FragColor = vec4(normal, 1.0);
#endif //unshaded
//apply fog
#if defined(FOG_DEPTH_ENABLED) || defined(FOG_HEIGHT_ENABLED)
@ -2189,6 +2187,8 @@ FRAGMENT_SHADER_CODE
#endif // defined(FOG_DEPTH_ENABLED) || defined(FOG_HEIGHT_ENABLED)
#endif //unshaded
#else // not RENDER_DEPTH
//depth render
#ifdef USE_RGBA_SHADOWS