diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-27 10:04:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 10:04:02 +0200 |
| commit | 2efff83ca904970278a5fb3bd334d654c48c17ee (patch) | |
| tree | 8dcb7994c06ed83039555b50f39db2c9d09af4f1 | |
| parent | a362db658869e146372ccd025ec42606115d157d (diff) | |
| parent | 2bb119c0882005468186d3f05c2902c13f2b7501 (diff) | |
Merge pull request #38135 from bruvzg/fix_ssr_redefinition
[MoltenVK] Fix "redefinition of 'ssr' with a different type" shader compile error.
| -rw-r--r-- | servers/rendering/rasterizer_rd/shaders/specular_merge.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/rasterizer_rd/shaders/specular_merge.glsl b/servers/rendering/rasterizer_rd/shaders/specular_merge.glsl index b28250318e..b24f7dccc7 100644 --- a/servers/rendering/rasterizer_rd/shaders/specular_merge.glsl +++ b/servers/rendering/rasterizer_rd/shaders/specular_merge.glsl @@ -48,8 +48,8 @@ void main() { frag_color.a = 0.0; #ifdef MODE_SSR - vec4 ssr = texture(ssr, uv_interp); - frag_color.rgb = mix(frag_color.rgb, ssr.rgb, ssr.a); + vec4 ssr_color = texture(ssr, uv_interp); + frag_color.rgb = mix(frag_color.rgb, ssr_color.rgb, ssr_color.a); #endif #ifdef MODE_MERGE |