From 7e136a792f381b4c1d310c7058d779e9e87aeb6c Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 19 Jan 2021 20:42:16 +0100 Subject: work on colourfilters --- src/extras/shaders/colourfilterLCS_PS.hlsl | 5 +---- src/extras/shaders/obj/colourfilterLCS_PS.cso | Bin 292 -> 308 bytes src/extras/shaders/obj/colourfilterLCS_PS.inc | 11 ++++++----- 3 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src/extras/shaders') diff --git a/src/extras/shaders/colourfilterLCS_PS.hlsl b/src/extras/shaders/colourfilterLCS_PS.hlsl index bd91567d..df1beefc 100644 --- a/src/extras/shaders/colourfilterLCS_PS.hlsl +++ b/src/extras/shaders/colourfilterLCS_PS.hlsl @@ -1,13 +1,10 @@ sampler2D tex : register(s0); float4 blurcol : register(c10); -//float4 blurcols[10] : register(c15); - - float4 main(in float2 texcoord : TEXCOORD0) : COLOR0 { float4 dst = tex2D(tex, texcoord.xy); - dst += dst*blurcol; + dst += dst*blurcol*blurcol.a; dst.a = 1.0; return dst; } diff --git a/src/extras/shaders/obj/colourfilterLCS_PS.cso b/src/extras/shaders/obj/colourfilterLCS_PS.cso index e5ffa3f1..17f2d612 100644 Binary files a/src/extras/shaders/obj/colourfilterLCS_PS.cso and b/src/extras/shaders/obj/colourfilterLCS_PS.cso differ diff --git a/src/extras/shaders/obj/colourfilterLCS_PS.inc b/src/extras/shaders/obj/colourfilterLCS_PS.inc index f9eeab52..20738662 100644 --- a/src/extras/shaders/obj/colourfilterLCS_PS.inc +++ b/src/extras/shaders/obj/colourfilterLCS_PS.inc @@ -19,9 +19,10 @@ static unsigned char colourfilterLCS_PS_cso[] = { 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x03, 0xb0, 0x1f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x90, 0x00, 0x08, 0x0f, 0xa0, 0x42, 0x00, 0x00, 0x03, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0xb0, - 0x00, 0x08, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x07, 0x80, - 0x00, 0x00, 0xe4, 0x80, 0x0a, 0x00, 0xe4, 0xa0, 0x00, 0x00, 0xe4, 0x80, - 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x00, 0xa0, - 0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80, 0x00, 0x00, 0xe4, 0x80, - 0xff, 0xff, 0x00, 0x00 + 0x00, 0x08, 0xe4, 0xa0, 0x05, 0x00, 0x00, 0x03, 0x01, 0x00, 0x07, 0x80, + 0x00, 0x00, 0xe4, 0x80, 0x0a, 0x00, 0xe4, 0xa0, 0x04, 0x00, 0x00, 0x04, + 0x00, 0x00, 0x07, 0x80, 0x01, 0x00, 0xe4, 0x80, 0x0a, 0x00, 0xff, 0xa0, + 0x00, 0x00, 0xe4, 0x80, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x08, 0x80, + 0x00, 0x00, 0x00, 0xa0, 0x01, 0x00, 0x00, 0x02, 0x00, 0x08, 0x0f, 0x80, + 0x00, 0x00, 0xe4, 0x80, 0xff, 0xff, 0x00, 0x00 }; -- cgit v1.2.3