seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29141 from clayjohn/gles2-fog

Browse Source 
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
parent c8957295a6 3365595254
commit eaff86f8bd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gles2/shaders/scene.glsl
View File

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