[Bf-blender-cvs] [e9eb80055bb] blender2.8: Cleanup: remove unused variable
mano-wii
noreply at git.blender.org
Fri Nov 16 17:50:08 CET 2018
Commit: e9eb80055bbfc302066da8d3462c369a10de81c0
Author: mano-wii
Date: Wed Nov 14 14:24:05 2018 -0200
Branches: blender2.8
https://developer.blender.org/rBe9eb80055bbfc302066da8d3462c369a10de81c0
Cleanup: remove unused variable
===================================================================
M source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl
M source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl b/source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl
index bda3c648bb6..40c6bb1f1e0 100644
--- a/source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/ambient_occlusion_lib.glsl
@@ -186,7 +186,7 @@ void integrate_slice(vec3 normal, vec2 t_phi, vec2 horizons, inout float visibil
}
void gtao_deferred(
- vec3 normal, vec3 position, vec4 noise, float frag_depth, out float visibility, out vec3 bent_normal)
+ vec3 normal, vec4 noise, float frag_depth, out float visibility, out vec3 bent_normal)
{
/* Fetch early, hide latency! */
vec4 horizons = texelFetch(horizonBuffer, ivec2(gl_FragCoord.xy), 0);
@@ -194,7 +194,6 @@ void gtao_deferred(
vec4 dirs;
dirs.xy = get_ao_dir(noise.x * 0.5);
dirs.zw = get_ao_dir(noise.x * 0.5 + 0.5);
- vec2 uvs = get_uvs_from_view(position);
bent_normal = vec3(0.0);
visibility = 0.0;
@@ -252,7 +251,7 @@ float occlusion_compute(vec3 N, vec3 vpos, float user_occlusion, vec4 rand, out
vec3 vnor = mat3(ViewMatrix) * N;
#ifdef ENABLE_DEFERED_AO
- gtao_deferred(vnor, vpos, rand, gl_FragCoord.z, visibility, bent_normal);
+ gtao_deferred(vnor, rand, gl_FragCoord.z, visibility, bent_normal);
#else
gtao(vnor, vpos, rand, visibility, bent_normal);
#endif
diff --git a/source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
index b7bcf5c8a8b..ccef05ef985 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_gtao_frag.glsl
@@ -26,7 +26,7 @@ void main()
vec4 noise = texelfetch_noise_tex(gl_FragCoord.xy);
- gtao_deferred(normal, viewPosition, noise, depth, visibility, bent_normal);
+ gtao_deferred(normal, noise, depth, visibility, bent_normal);
/* Handle Background case. Prevent artifact due to uncleared Horizon Render Target. */
FragColor = vec4((depth == 1.0) ? 0.0 : visibility);
More information about the Bf-blender-cvs
mailing list