diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-13 17:27:12 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-13 17:27:12 +0000 |
| commit | 4231714698018b8bd75f3f57df849f81cab05d9c (patch) | |
| tree | 8695606e3038ee5e5d31f2b7c0c8c1a63fc540d8 /indra/newview/app_settings/shaders/class1/windlight | |
| parent | bda785e8b1bef35ecd9d45a7092b0ab66c17d1f4 (diff) | |
| parent | a49e2b604e6b505e083e24b10e39053196d917c1 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #189)
SL-10044 SL-10045
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/windlight')
3 files changed, 19 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl index 9e5893d32a..c16e3d50a2 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersF.glsl @@ -41,3 +41,9 @@ vec3 atmosGetDiffuseSunlightColor() return sunlight_color.rgb; } +vec3 scaleDownLight(vec3 light) +{ + /* stub function for fallback compatibility on class1 hardware */ + return light; +} + diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl index 01f19087ff..89b6a52909 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsHelpersV.glsl @@ -41,3 +41,15 @@ vec3 atmosGetDiffuseSunlightColor() return sunlight_color.rgb; } +vec3 scaleDownLight(vec3 light) +{ + /* stub function for fallback compatibility on class1 hardware */ + return light; +} + +vec3 scaleUpLight(vec3 light) +{ + /* stub function for fallback compatibility on class1 hardware */ + return light; +} + diff --git a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl index 768d93f005..667301443a 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/gammaF.glsl @@ -39,7 +39,7 @@ vec3 scaleSoftClip(vec3 light) return light; } -vec3 fullbrightScaleSoftClipFrag(vec3 light) +vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 additive, vec3 atten) { // For compatibility with lower cards. Do nothing return light; |