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

Merge pull request #50144 from reduz/fix-ssr

Browse source 
Fix SSR
This commit is contained in:
Rémi Verschelde 2021-07-04 09:20:22 +02:00 committed by GitHub
commit 8838e3d3d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/rendering/renderer_rd/effects_rd.cpp
View file

@ -503,11 +503,10 @@ void EffectsRD::screen_space_reflection(RID p_diffuse, RID p_normal_roughness, R
if (p_roughness_quality != RS::ENV_SSR_ROUGNESS_QUALITY_DISABLED) { if (p_roughness_quality != RS::ENV_SSR_ROUGNESS_QUALITY_DISABLED) {
RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_image_pair(p_output, p_blur_radius), 1); RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_image_pair(p_output, p_blur_radius), 1);
RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_texture_pair(p_metallic, p_normal_roughness), 3);
} else { } else {
RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_uniform_set_from_image(p_output), 1); RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_uniform_set_from_image(p_output), 1);
RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_texture(p_metallic), 3);
} }
RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_compute_uniform_set_from_texture(p_metallic), 3);
RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_uniform_set_from_image(p_scale_normal), 2); RD::get_singleton()->compute_list_bind_uniform_set(compute_list, _get_uniform_set_from_image(p_scale_normal), 2);
RD::get_singleton()->compute_list_dispatch_threads(compute_list, p_screen_size.width, p_screen_size.height, 1); RD::get_singleton()->compute_list_dispatch_threads(compute_list, p_screen_size.width, p_screen_size.height, 1);

15
servers/rendering/renderer_rd/shaders/screen_space_reflection_scale.glsl
View file

@ -36,12 +36,12 @@ void main() {
float divisor = 0.0; float divisor = 0.0;
vec4 color; vec4 color;
float depth; float depth;
vec3 normal; vec4 normal;
if (params.filtered) { if (params.filtered) {
color = vec4(0.0); color = vec4(0.0);
depth = 0.0; depth = 0.0;
normal = vec3(0.0); normal = vec4(0.0);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
ivec2 ofs = ssC << 1; ivec2 ofs = ssC << 1;
@ -53,7 +53,9 @@ void main() {
} }
color += texelFetch(source_ssr, ofs, 0); color += texelFetch(source_ssr, ofs, 0);
float d = texelFetch(source_depth, ofs, 0).r; float d = texelFetch(source_depth, ofs, 0).r;
normal += texelFetch(source_normal, ofs, 0).xyz * 2.0 - 1.0; vec4 nr = texelFetch(source_normal, ofs, 0);
normal.xyz += nr.xyz * 2.0 - 1.0;
normal.w += nr.w;
d = d * 2.0 - 1.0; d = d * 2.0 - 1.0;
if (params.orthogonal) { if (params.orthogonal) {
@ -66,11 +68,12 @@ void main() {
color /= 4.0; color /= 4.0;
depth /= 4.0; depth /= 4.0;
normal = normalize(normal / 4.0) * 0.5 + 0.5; normal.xyz = normalize(normal.xyz / 4.0) * 0.5 + 0.5;
normal.w /= 4.0;
} else { } else {
color = texelFetch(source_ssr, ssC << 1, 0); color = texelFetch(source_ssr, ssC << 1, 0);
depth = texelFetch(source_depth, ssC << 1, 0).r; depth = texelFetch(source_depth, ssC << 1, 0).r;
normal = texelFetch(source_normal, ssC << 1, 0).xyz; normal = texelFetch(source_normal, ssC << 1, 0);
depth = depth * 2.0 - 1.0; depth = depth * 2.0 - 1.0;
if (params.orthogonal) { if (params.orthogonal) {
@ -83,5 +86,5 @@ void main() {
imageStore(dest_ssr, ssC, color); imageStore(dest_ssr, ssC, color);
imageStore(dest_depth, ssC, vec4(depth)); imageStore(dest_depth, ssC, vec4(depth));
imageStore(dest_normal, ssC, vec4(normal, 0.0)); imageStore(dest_normal, ssC, normal);
} }