godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Merge pull request #49549 from clayjohn/VULKAN-roughness-limiter

Browse Source 
Fix roughness limiter derivative
This commit is contained in:
Juan Linietsky
2021-06-12 21:29:34 -03:00
committed by GitHub
parent 6feae6d219 9a5e00be6f
commit bb94344937
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/rendering/renderer_rd/shaders/scene_forward_clustered.glsl
View File

@@ -850,7 +850,7 @@ void main() {
if (scene_data.roughness_limiter_enabled) { if (scene_data.roughness_limiter_enabled) {
//http://www.jp.square-enix.com/tech/library/pdf/ImprovedGeometricSpecularAA.pdf //http://www.jp.square-enix.com/tech/library/pdf/ImprovedGeometricSpecularAA.pdf
float roughness2 = roughness * roughness; float roughness2 = roughness * roughness;
vec3 dndu = dFdx(normal), dndv = dFdx(normal); vec2 dndu = dFdx(normal), dndv = dFdy(normal);
float variance = scene_data.roughness_limiter_amount * (dot(dndu, dndu) + dot(dndv, dndv)); float variance = scene_data.roughness_limiter_amount * (dot(dndu, dndu) + dot(dndv, dndv));
float kernelRoughness2 = min(2.0 * variance, scene_data.roughness_limiter_limit); //limit effect float kernelRoughness2 = min(2.0 * variance, scene_data.roughness_limiter_limit); //limit effect
float filteredRoughness2 = min(1.0, roughness2 + kernelRoughness2); float filteredRoughness2 = min(1.0, roughness2 + kernelRoughness2);

2
servers/rendering/renderer_rd/shaders/scene_forward_mobile.glsl
View File

@@ -761,7 +761,7 @@ void main() {
if (scene_data.roughness_limiter_enabled) { if (scene_data.roughness_limiter_enabled) {
//http://www.jp.square-enix.com/tech/library/pdf/ImprovedGeometricSpecularAA.pdf //http://www.jp.square-enix.com/tech/library/pdf/ImprovedGeometricSpecularAA.pdf
float roughness2 = roughness * roughness; float roughness2 = roughness * roughness;
vec3 dndu = dFdx(normal), dndv = dFdx(normal); vec3 dndu = dFdx(normal), dndv = dFdy(normal);
float variance = scene_data.roughness_limiter_amount * (dot(dndu, dndu) + dot(dndv, dndv)); float variance = scene_data.roughness_limiter_amount * (dot(dndu, dndu) + dot(dndv, dndv));
float kernelRoughness2 = min(2.0 * variance, scene_data.roughness_limiter_limit); //limit effect float kernelRoughness2 = min(2.0 * variance, scene_data.roughness_limiter_limit); //limit effect
float filteredRoughness2 = min(1.0, roughness2 + kernelRoughness2); float filteredRoughness2 = min(1.0, roughness2 + kernelRoughness2);