diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-20 18:14:29 +0100 | 
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-04-20 18:14:29 +0100 | 
| commit | 0d7fa932d579f3fb6140658db7efb01fcd8f5ceb (patch) | |
| tree | 09ce964ef40613fc27976ca5c23759e9d1ff2764 /indra/newview/app_settings/shaders/class3 | |
| parent | 528ccdc97fae50f30b7606b8942ca953deec7c8a (diff) | |
Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch).
Put in nSight debug support.
Diffstat (limited to 'indra/newview/app_settings/shaders/class3')
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/cloudsF.glsl (renamed from indra/newview/app_settings/shaders/class3/windlight/cloudsF.glsl) | 0 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/cloudsV.glsl (renamed from indra/newview/app_settings/shaders/class3/windlight/cloudsV.glsl) | 0 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/skyF.glsl (renamed from indra/newview/app_settings/shaders/class3/windlight/skyF.glsl) | 6 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/skyV.glsl (renamed from indra/newview/app_settings/shaders/class3/windlight/skyV.glsl) | 0 | 
4 files changed, 2 insertions, 4 deletions
| diff --git a/indra/newview/app_settings/shaders/class3/windlight/cloudsF.glsl b/indra/newview/app_settings/shaders/class3/deferred/cloudsF.glsl index 96c70651b1..96c70651b1 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/cloudsF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/cloudsF.glsl diff --git a/indra/newview/app_settings/shaders/class3/windlight/cloudsV.glsl b/indra/newview/app_settings/shaders/class3/deferred/cloudsV.glsl index c1dd45cd67..c1dd45cd67 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/cloudsV.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/cloudsV.glsl diff --git a/indra/newview/app_settings/shaders/class3/windlight/skyF.glsl b/indra/newview/app_settings/shaders/class3/deferred/skyF.glsl index 08b6ec3f97..0223f94e55 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/skyF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/skyF.glsl @@ -38,7 +38,8 @@ uniform vec2 sun_size;  uniform sampler2D cloud_noise_texture;  uniform sampler2D transmittance_texture;  uniform sampler3D scattering_texture; -uniform sampler3D mie_scattering_texture; +uniform sampler3D single_mie_scattering_texture; +uniform sampler2D irradiance_texture;  vec3 GetSolarLuminance();  vec3 GetSkyLuminance(vec3 camPos, vec3 view_dir, float shadow_length, vec3 sun_dir, out vec3 transmittance); @@ -53,8 +54,6 @@ void main()      vec3 transmittance;      vec3 radiance = GetSkyLuminance(camPos, view_direction, 0.0f, sun_direction, transmittance); -    //radiance *= transmittance; -      // If the view ray intersects the Sun, add the Sun radiance.      if (dot(view_direction, sun_direction) >= sun_size.y)      { @@ -65,7 +64,6 @@ void main()      color = pow(color, vec3(1.0 / 2.2));      frag_color.rgb = color; -       frag_color.a = 1.0;  } diff --git a/indra/newview/app_settings/shaders/class3/windlight/skyV.glsl b/indra/newview/app_settings/shaders/class3/deferred/skyV.glsl index 52a7595379..52a7595379 100644 --- a/indra/newview/app_settings/shaders/class3/windlight/skyV.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/skyV.glsl | 
