diff options
author | Rider Linden <rider@lindenlab.com> | 2018-06-29 23:50:31 +0000 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-06-29 23:50:31 +0000 |
commit | ab159f7c4a35196003add5592df95fe2c139984e (patch) | |
tree | 99b868926e98a32433ce391d41f40c575c155b2a /indra/newview/app_settings | |
parent | affd9ac094b8c2fba19b6bcc43ee6460be3dca28 (diff) | |
parent | ec496d5e1abf9681895062f297fd8a62f057986e (diff) |
Merged in graham_linden/viewer-eep-graham (pull request #13)
MAINT-4019 fix star rendering in advanced lighting mode
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/starsF.glsl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl index 029a98e16a..f397a4a151 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl @@ -28,19 +28,19 @@ #ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_data[3]; #else -#define frag_data gl_FragData +#define frag_color gl_FragColor #endif VARYING vec4 vertex_color; VARYING vec2 vary_texcoord0; uniform sampler2D diffuseMap; +uniform float custom_alpha; void main() { vec4 col = vertex_color * texture2D(diffuseMap, vary_texcoord0.xy); + col.a *= custom_alpha; - frag_data[0] = col; - frag_data[1] = vec4(0,0,0,0); - frag_data[2] = vec4(0,0,1,0); + frag_color = col; } |