asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #38135 from bruvzg/fix_ssr_redefinition

Browse source 
[MoltenVK] Fix "redefinition of 'ssr' with a different type" shader compile error.
This commit is contained in:
Rémi Verschelde 2020-04-27 10:04:02 +02:00 committed by GitHub
commit 2efff83ca9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/rendering/rasterizer_rd/shaders/specular_merge.glsl
View file

@ -48,8 +48,8 @@ void main() {
frag_color.a = 0.0; frag_color.a = 0.0;
#ifdef MODE_SSR #ifdef MODE_SSR
vec4 ssr = texture(ssr, uv_interp); vec4 ssr_color = texture(ssr, uv_interp);
frag_color.rgb = mix(frag_color.rgb, ssr.rgb, ssr.a); frag_color.rgb = mix(frag_color.rgb, ssr_color.rgb, ssr_color.a);
#endif #endif
#ifdef MODE_MERGE #ifdef MODE_MERGE