From 8c70c2a136d6412e27550c1c2584d972f9d9812a Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 18 Nov 2020 10:32:18 +0100 Subject: changes to librw layer, GLES now runtime choice --- src/extras/shaders/neoWorldVC.frag | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/extras/shaders/neoWorldVC.frag') diff --git a/src/extras/shaders/neoWorldVC.frag b/src/extras/shaders/neoWorldVC.frag index 0270f305..08cae743 100644 --- a/src/extras/shaders/neoWorldVC.frag +++ b/src/extras/shaders/neoWorldVC.frag @@ -3,12 +3,10 @@ uniform sampler2D tex1; uniform vec4 u_lightMap; -in vec4 v_color; -in vec2 v_tex0; -in vec2 v_tex1; -in float v_fog; - -out vec4 color; +FSIN vec4 v_color; +FSIN vec2 v_tex0; +FSIN vec2 v_tex1; +FSIN float v_fog; void main(void) @@ -16,10 +14,13 @@ main(void) vec4 t0 = texture(tex0, vec2(v_tex0.x, 1.0-v_tex0.y)); vec4 t1 = texture(tex1, vec2(v_tex1.x, 1.0-v_tex1.y)); - color = t0*v_color*(1 + u_lightMap*(t1-1)); + vec4 color; + color = t0*v_color*(1.0 + u_lightMap*(t1-1.0)); color.a = v_color.a*t0.a*u_lightMap.a; color.rgb = mix(u_fogColor.rgb, color.rgb, v_fog); DoAlphaTest(color.a); + + FRAGCOLOR(color); } -- cgit v1.2.3