summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-30 00:22:10 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-30 00:22:10 +0100
commitec496d5e1abf9681895062f297fd8a62f057986e (patch)
tree7289f5d00d0ca1773cd0662f0e4c973141e54fe8 /indra/newview/app_settings
parentaa7d75cb7be7e752f6ff408e03c489fb62f68630 (diff)
MAINT-4019 fix ALM star rendering (make post-deferred and actually blend)
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/starsF.glsl8
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;
}