From 258ba00a03dbc2604f56eaa60a8dd9491e94c446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cle=CC=81ment=20Foucault?= Date: Mon, 25 Dec 2023 00:06:10 +1300 Subject: [PATCH] Fix: EEVEE-Next: Wrong function declaration order --- .../eevee_next/shaders/eevee_gbuffer_lib.glsl | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl index bdec89a47a4..5570318f83f 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_gbuffer_lib.glsl @@ -202,23 +202,6 @@ float gbuffer_thickness_unpack(float thickness_packed) return gbuffer_ior_unpack(thickness_packed); } -vec4 gbuffer_sss_radii_pack(vec3 sss_radii) -{ - /* TODO(fclem): Something better. */ - return gbuffer_closure_color_pack(vec3(gbuffer_ior_pack(sss_radii.x), - gbuffer_ior_pack(sss_radii.y), - gbuffer_ior_pack(sss_radii.z))); -} - -vec3 gbuffer_sss_radii_unpack(vec4 sss_radii_packed) -{ - /* TODO(fclem): Something better. */ - vec3 radii_packed = gbuffer_closure_color_unpack(sss_radii_packed); - return vec3(gbuffer_ior_unpack(radii_packed.x), - gbuffer_ior_unpack(radii_packed.y), - gbuffer_ior_unpack(radii_packed.z)); -} - /** * Pack color with values in the range of [0..8] using a 2 bit shared exponent. * This allows values up to 8 with some color degradation. @@ -238,6 +221,22 @@ vec3 gbuffer_closure_color_unpack(vec4 color_packed) return color_packed.rgb * exp2(exponent); } +vec4 gbuffer_sss_radii_pack(vec3 sss_radii) +{ + /* TODO(fclem): Something better. */ + return gbuffer_closure_color_pack(vec3(gbuffer_ior_pack(sss_radii.x), + gbuffer_ior_pack(sss_radii.y), + gbuffer_ior_pack(sss_radii.z))); +} +vec3 gbuffer_sss_radii_unpack(vec4 sss_radii_packed) +{ + /* TODO(fclem): Something better. */ + vec3 radii_packed = gbuffer_closure_color_unpack(sss_radii_packed); + return vec3(gbuffer_ior_unpack(radii_packed.x), + gbuffer_ior_unpack(radii_packed.y), + gbuffer_ior_unpack(radii_packed.z)); +} + /** * Pack value in the range of [0..8] using a 2 bit exponent. * This allows values up to 8 with some color degradation.