From b3df764bd3c461df49f0f2289b66c87a76e71d34 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 15 May 2013 17:35:28 -0500 Subject: Attempt at making deferred rendering work on OpenGL 2.1 --- .../app_settings/shaders/class1/deferred/alphaV.glsl | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl') diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index 77d02b36ff..9cc2eb0cf3 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -69,11 +69,8 @@ VARYING vec3 vary_ambient; VARYING vec3 vary_directional; VARYING vec3 vary_fragcoord; VARYING vec3 vary_position; -VARYING vec3 vary_pointlight_col; +VARYING vec4 vary_pointlight_col; -#ifdef USE_VERTEX_COLOR -VARYING vec4 vertex_color; -#endif VARYING vec2 vary_texcoord0; @@ -186,9 +183,9 @@ void main() - vary_pointlight_col = diff; + vary_pointlight_col.rgb = diff; + vary_pointlight_col.a = vertex_color.a; - col.rgb = vec3(0,0,0); // Add windlight lights @@ -200,9 +197,7 @@ void main() col.rgb = col.rgb*diff.rgb; -#ifdef USE_VERTEX_COLOR - vertex_color = col; -#endif + #ifdef HAS_SKIN vary_fragcoord.xyz = frag_pos.xyz + vec3(0,0,near_clip); -- cgit v1.2.3 From f18fd226c32747dfb53f4d4f7b00b7d682133d5e Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 16 May 2013 17:13:16 -0500 Subject: Fix for compilation error in shadows disabled and don't load transform feedback shaders unless transform feedback is enabled. --- indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl') diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index 9cc2eb0cf3..dc497e063b 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -184,7 +184,7 @@ void main() vary_pointlight_col.rgb = diff; - vary_pointlight_col.a = vertex_color.a; + vary_pointlight_col.a = col.a; col.rgb = vec3(0,0,0); -- cgit v1.2.3 From 559934705fd766430ccdd4b4e41e26a277f63637 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 17 May 2013 12:27:50 -0500 Subject: Backout OpenGL 2.1 compatibility attempt --- .../app_settings/shaders/class1/deferred/alphaV.glsl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl') diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index dc497e063b..77d02b36ff 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -69,8 +69,11 @@ VARYING vec3 vary_ambient; VARYING vec3 vary_directional; VARYING vec3 vary_fragcoord; VARYING vec3 vary_position; -VARYING vec4 vary_pointlight_col; +VARYING vec3 vary_pointlight_col; +#ifdef USE_VERTEX_COLOR +VARYING vec4 vertex_color; +#endif VARYING vec2 vary_texcoord0; @@ -183,9 +186,9 @@ void main() - vary_pointlight_col.rgb = diff; - vary_pointlight_col.a = col.a; + vary_pointlight_col = diff; + col.rgb = vec3(0,0,0); // Add windlight lights @@ -197,7 +200,9 @@ void main() col.rgb = col.rgb*diff.rgb; - +#ifdef USE_VERTEX_COLOR + vertex_color = col; +#endif #ifdef HAS_SKIN vary_fragcoord.xyz = frag_pos.xyz + vec3(0,0,near_clip); -- cgit v1.2.3 From 88a42cd453b19e66551a36d635981da5aaa04933 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 17 May 2013 13:54:58 -0500 Subject: NORSPEC-187 Add directionality to ambient lighting. --- indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl') diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index 77d02b36ff..247ee0a34f 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -86,6 +86,8 @@ uniform vec3 light_direction[8]; uniform vec3 light_attenuation[8]; uniform vec3 light_diffuse[8]; +uniform vec3 sun_dir; + vec3 calcDirectionalLight(vec3 n, vec3 l) { float a = max(dot(n,l),0.0); @@ -194,6 +196,13 @@ void main() // Add windlight lights col.rgb = atmosAmbient(col.rgb); + float ambient = min(abs(dot(norm.xyz, sun_dir.xyz)), 1.0); + ambient *= 0.5; + ambient *= ambient; + ambient = (1.0-ambient); + + col.rgb *= ambient; + vary_ambient = col.rgb*diff.rgb; vary_directional.rgb = atmosAffectDirectionalLight(1.0f); -- cgit v1.2.3