From 80d66bb1d6dee4f6e0d91ddf415d123b0aace1e2 Mon Sep 17 00:00:00 2001 From: Ryan Holtz Date: Sat, 11 Jun 2011 23:46:24 +0000 Subject: HLSL Cleanup, no whatsnew: - Fixed set_vector functionality and simplified shaders as a result - Fixed HLSL presets, 0 to 3, in increasing level of terribleness - Reduced options footprint from RGB triplets Next plan: Separate INI writing. --- hlsl/focus.fx | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'hlsl/focus.fx') diff --git a/hlsl/focus.fx b/hlsl/focus.fx index c5e95baf6e8..de660af7d24 100644 --- a/hlsl/focus.fx +++ b/hlsl/focus.fx @@ -63,8 +63,7 @@ uniform float TargetHeight; uniform float WidthRatio; uniform float HeightRatio; -uniform float DefocusX; -uniform float DefocusY; +uniform float2 Defocus = float2(0.0f, 0.0f); uniform float FocusEnable; float2 Coord0Offset = float2( 0.0f, 0.0f); @@ -92,15 +91,14 @@ VS_OUTPUT vs_main(VS_INPUT Input) float2 InvTexSize = float2(1.0f / TargetWidth, 1.0f / TargetHeight); float2 TexCoord = Input.TexCoord; TexCoord = TexCoord + 0.5f * InvTexSize; - float2 DefocusVal = float2(DefocusX, DefocusY); - Output.TexCoord0 = TexCoord + Coord0Offset * InvTexSize * DefocusVal; - Output.TexCoord1 = TexCoord + Coord1Offset * InvTexSize * DefocusVal; - Output.TexCoord2 = TexCoord + Coord2Offset * InvTexSize * DefocusVal; - Output.TexCoord3 = TexCoord + Coord3Offset * InvTexSize * DefocusVal; - Output.TexCoord4 = TexCoord + Coord4Offset * InvTexSize * DefocusVal; - Output.TexCoord5 = TexCoord + Coord5Offset * InvTexSize * DefocusVal; - Output.TexCoord6 = TexCoord + Coord6Offset * InvTexSize * DefocusVal; - Output.TexCoord7 = TexCoord + Coord7Offset * InvTexSize * DefocusVal; + Output.TexCoord0 = TexCoord + Coord0Offset * InvTexSize * Defocus; + Output.TexCoord1 = TexCoord + Coord1Offset * InvTexSize * Defocus; + Output.TexCoord2 = TexCoord + Coord2Offset * InvTexSize * Defocus; + Output.TexCoord3 = TexCoord + Coord3Offset * InvTexSize * Defocus; + Output.TexCoord4 = TexCoord + Coord4Offset * InvTexSize * Defocus; + Output.TexCoord5 = TexCoord + Coord5Offset * InvTexSize * Defocus; + Output.TexCoord6 = TexCoord + Coord6Offset * InvTexSize * Defocus; + Output.TexCoord7 = TexCoord + Coord7Offset * InvTexSize * Defocus; return Output; } -- cgit v1.2.3