ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx: Just some small post processing cleanup changes, should lower the FXAA compiling time on pause/resumes. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5872 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Asmodean.pcsx2 2014-02-02 17:50:32 +00:00
parent 1fb3d7dd17
commit 02afca3bb6
5 changed files with 81 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/GSdx/GSDevice11.cpp
View File

@ -31,8 +31,10 @@ GSDevice11::GSDevice11()
memset(&m_vs_cb_cache, 0, sizeof(m_vs_cb_cache)); memset(&m_vs_cb_cache, 0, sizeof(m_vs_cb_cache));
memset(&m_ps_cb_cache, 0, sizeof(m_ps_cb_cache)); memset(&m_ps_cb_cache, 0, sizeof(m_ps_cb_cache));
FXAA_Compiled = false;
ExShader_Compiled = false;
UserHacks_NVIDIAHack = !!theApp.GetConfig("UserHacks_NVIDIAHack", 0) && !!theApp.GetConfig("UserHacks", 0); UserHacks_NVIDIAHack = !!theApp.GetConfig("UserHacks_NVIDIAHack", 0) && !!theApp.GetConfig("UserHacks", 0);
FFXA_Compiled = false;
m_state.topology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED; m_state.topology = D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED;
m_state.bf = -1; m_state.bf = -1;
@ -274,8 +276,6 @@ bool GSDevice11::Create(GSWnd* wnd)
hr = m_dev->CreateBuffer(&bd, NULL, &m_shaderfx.cb); hr = m_dev->CreateBuffer(&bd, NULL, &m_shaderfx.cb);
ExShader_Compiled = false;
// Fxaa // Fxaa
memset(&bd, 0, sizeof(bd)); memset(&bd, 0, sizeof(bd));
@ -286,7 +286,7 @@ bool GSDevice11::Create(GSWnd* wnd)
hr = m_dev->CreateBuffer(&bd, NULL, &m_fxaa.cb); hr = m_dev->CreateBuffer(&bd, NULL, &m_fxaa.cb);
FFXA_Compiled = false; //
memset(&rd, 0, sizeof(rd)); memset(&rd, 0, sizeof(rd));
@ -773,7 +773,7 @@ void GSDevice11::DoExternalFX(GSTexture* st, GSTexture* dt)
// and for some reason isolating this code makes the plugin not crash // and for some reason isolating this code makes the plugin not crash
void GSDevice11::InitFXAA() void GSDevice11::InitFXAA()
{ {
if (!FFXA_Compiled) if (!FXAA_Compiled)
{ {
try { try {
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps); CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
@ -781,7 +781,7 @@ void GSDevice11::InitFXAA()
catch (GSDXRecoverableError) { catch (GSDXRecoverableError) {
CompileShader(IDR_FXAA_FX, "ps_recover", NULL, &m_fxaa.ps); CompileShader(IDR_FXAA_FX, "ps_recover", NULL, &m_fxaa.ps);
} }
FFXA_Compiled = true; FXAA_Compiled = true;
} }
} }

4
plugins/GSdx/GSDevice11.h
View File

@ -85,9 +85,9 @@ class GSDevice11 : public GSDeviceDX
public: // TODO public: // TODO
CComPtr<ID3D11RasterizerState> m_rs; CComPtr<ID3D11RasterizerState> m_rs;
bool UserHacks_NVIDIAHack; bool FXAA_Compiled;
bool FFXA_Compiled;
bool ExShader_Compiled; bool ExShader_Compiled;
bool UserHacks_NVIDIAHack;
struct struct
{ {

67
plugins/GSdx/GSDevice9.cpp
View File

@ -28,7 +28,9 @@ GSDevice9::GSDevice9()
: m_lost(false) : m_lost(false)
{ {
m_rbswapped = true; m_rbswapped = true;
FFXA_Compiled = false; FXAA_Compiled = false;
ExShader_Compiled = false;
memset(&m_pp, 0, sizeof(m_pp)); memset(&m_pp, 0, sizeof(m_pp));
memset(&m_d3dcaps, 0, sizeof(m_d3dcaps)); memset(&m_d3dcaps, 0, sizeof(m_d3dcaps));
@ -359,23 +361,6 @@ bool GSDevice9::Create(GSWnd* wnd)
CompileShader(IDR_SHADEBOOST_FX, "ps_main", macro, &m_shadeboost.ps); CompileShader(IDR_SHADEBOOST_FX, "ps_main", macro, &m_shadeboost.ps);
ExShader_Compiled = false;
FFXA_Compiled = false;
/*
// fxaa
if (Use_FXAA_Shader)
{
#if EXTERNAL_SHADER_LOADING
try {
CompileShader("shader.fx", "ps_main", NULL, &m_fxaa.ps);
}
catch (GSDXRecoverableError) {
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
}
#else
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
#endif
}*/
// create shader layout // create shader layout
VSSelector sel; VSSelector sel;
@ -935,16 +920,8 @@ void GSDevice9::DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linea
StretchRect(st, sr, dt, dr, m_interlace.ps[shader], (const float*)&cb, 1, linear); StretchRect(st, sr, dt, dr, m_interlace.ps[shader], (const float*)&cb, 1, linear);
} }
void GSDevice9::InitExternalFX()
void GSDevice9::DoExternalFX(GSTexture* st, GSTexture* dt)
{ {
GSVector2i s = dt->GetSize();
GSVector4 sr(0, 0, 1, 1);
GSVector4 dr(0, 0, s.x, s.y);
ExternalFXConstantBuffer cb;
if (!ExShader_Compiled) if (!ExShader_Compiled)
{ {
try { try {
@ -955,6 +932,18 @@ void GSDevice9::DoExternalFX(GSTexture* st, GSTexture* dt)
} }
ExShader_Compiled = true; ExShader_Compiled = true;
} }
}
void GSDevice9::DoExternalFX(GSTexture* st, GSTexture* dt)
{
GSVector2i s = dt->GetSize();
GSVector4 sr(0, 0, 1, 1);
GSVector4 dr(0, 0, s.x, s.y);
ExternalFXConstantBuffer cb;
InitExternalFX();
cb.rcpFrame = GSVector4(1.0f / s.x, 1.0f / s.y, 0.0f, 0.0f); cb.rcpFrame = GSVector4(1.0f / s.x, 1.0f / s.y, 0.0f, 0.0f);
cb.rcpFrameOpt = GSVector4::zero(); cb.rcpFrameOpt = GSVector4::zero();
@ -962,6 +951,19 @@ void GSDevice9::DoExternalFX(GSTexture* st, GSTexture* dt)
StretchRect(st, sr, dt, dr, m_shaderfx.ps, (const float*)&cb, 2, true); StretchRect(st, sr, dt, dr, m_shaderfx.ps, (const float*)&cb, 2, true);
} }
void GSDevice9::InitFXAA()
{
if (!FXAA_Compiled)
{
try {
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
}
catch (GSDXRecoverableError) {
CompileShader(IDR_FXAA_FX, "ps_recover", NULL, &m_fxaa.ps);
}
FXAA_Compiled = true;
}
}
void GSDevice9::DoFXAA(GSTexture* st, GSTexture* dt) void GSDevice9::DoFXAA(GSTexture* st, GSTexture* dt)
{ {
@ -972,16 +974,7 @@ void GSDevice9::DoFXAA(GSTexture* st, GSTexture* dt)
FXAAConstantBuffer cb; FXAAConstantBuffer cb;
if (!FFXA_Compiled) InitFXAA();
{
try {
CompileShader(IDR_FXAA_FX, "ps_main", NULL, &m_fxaa.ps);
}
catch (GSDXRecoverableError) {
CompileShader(IDR_FXAA_FX, "ps_recover", NULL, &m_fxaa.ps);
}
FFXA_Compiled = true;
}
cb.rcpFrame = GSVector4(1.0f / s.x, 1.0f / s.y, 0.0f, 0.0f); cb.rcpFrame = GSVector4(1.0f / s.x, 1.0f / s.y, 0.0f, 0.0f);
cb.rcpFrameOpt = GSVector4::zero(); cb.rcpFrameOpt = GSVector4::zero();

5
plugins/GSdx/GSDevice9.h
View File

@ -75,6 +75,9 @@ class GSDevice9 : public GSDeviceDX
void DoShadeBoost(GSTexture* st, GSTexture* dt); void DoShadeBoost(GSTexture* st, GSTexture* dt);
void DoExternalFX(GSTexture* st, GSTexture* dt); void DoExternalFX(GSTexture* st, GSTexture* dt);
void InitExternalFX();
void InitFXAA();
// //
D3DCAPS9 m_d3dcaps; D3DCAPS9 m_d3dcaps;
@ -114,7 +117,7 @@ class GSDevice9 : public GSDeviceDX
public: // TODO public: // TODO
bool FFXA_Compiled; bool FXAA_Compiled;
bool ExShader_Compiled; bool ExShader_Compiled;
struct struct

169
plugins/GSdx/res/fxaa.fx
View File

@ -1,6 +1,6 @@
/*===============================================================================*\ /*===============================================================================*\
|######################### [GSdx FXAA 2.00 Revised] ######################| |####################### [GSdx FXAA 2.00] ########################|
|########################### By Asmodean ########################| |######################## By Asmodean #########################|
|| || || ||
|| This program is free software; you can redistribute it and/or || || This program is free software; you can redistribute it and/or ||
|| modify it under the terms of the GNU General Public License || || modify it under the terms of the GNU General Public License ||
@ -16,13 +16,9 @@
\*===============================================================================*/ \*===============================================================================*/
#ifdef SHADER_MODEL #ifdef SHADER_MODEL
//-#[ANTIALIASING TECHNIQUES] [1=ON|0=OFF] #READ: For best results: Use post antialiasing OR FS filtering. Not both. Postfix [2D/3D] after descriptions indicates if it's typically better for 2D, or 3D. #define UHQ_FXAA 1 //High Quality Fast Approximate Anti Aliasing. Adapted for GSdx from Timothy Lottes FXAA 3.11.
#define UHQ_FXAA 1 //#High Quality Fast Approximate Anti Aliasing. Adapted for GSdx from Timothy Lottes FXAA 3.11. [3D]. #define FxaaSubpixMax 0.0 //[0.00 to 1.00] Amount of subpixel aliasing removal. 0.00: Edge only antialiasing (no blurring)
#define FxaaEarlyExit 1 //[0 or 1] Use Fxaa early exit pathing. When disabled, the entire scene is antialiased(FSAA). 0 is off, 1 is on.
//-[FXAA OPTIONS]
#define FxaaSubpixMax 0.00 //[0.00 to 1.00] Amount of subpixel aliasing removal. Higher values: more subpixel antialiasing(softer). Lower values: less subpixel antialiasing(sharper). 0.00: Edge only antialiasing (no blurring)
#define FxaaQuality 4 //[1|2|3|4] Overall Fxaa quality preset (pixel coverage). 1: Low, 2: Medium, 3: High, 4: Ultra. I use these labels lightly, as even the 'low coverage' preset is in fact, still pretty high quality.
#define FxaaEarlyExit 1 //[0 or 1] Use Fxaa early exit pathing. This basically tells the algorithm to offset only luma-edge detected pixels. When disabled, the entire scene is antialiased(FSAA). 0 is off, 1 is on.
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
[GLOBALS|FUNCTIONS] [GLOBALS|FUNCTIONS]
@ -30,13 +26,7 @@
#if (SHADER_MODEL >= 0x400) #if (SHADER_MODEL >= 0x400)
Texture2D Texture : register(t0); Texture2D Texture : register(t0);
SamplerState TextureSampler : register(s0) SamplerState TextureSampler : register(s0);
{
Filter = Anisotropic;
MaxAnisotropy = 16;
AddressU = Clamp;
AddressV = Clamp;
};
#else #else
texture2D Texture : register(t0); texture2D Texture : register(t0);
sampler2D TextureSampler : register(s0); sampler2D TextureSampler : register(s0);
@ -83,6 +73,7 @@ float RGBLuminance(float3 color)
float3 RGBGammaToLinear(float3 color, float gamma) float3 RGBGammaToLinear(float3 color, float gamma)
{ {
color = abs(color); color = abs(color);
color.r = (color.r <= 0.0404482362771082) ? saturate(color.r / 12.92) : color.r = (color.r <= 0.0404482362771082) ? saturate(color.r / 12.92) :
saturate(pow((color.r + 0.055) / 1.055, gamma)); saturate(pow((color.r + 0.055) / 1.055, gamma));
@ -98,6 +89,7 @@ float3 RGBGammaToLinear(float3 color, float gamma)
float3 LinearToRGBGamma(float3 color, float gamma) float3 LinearToRGBGamma(float3 color, float gamma)
{ {
color = abs(color); color = abs(color);
color.r = (color.r <= 0.00313066844250063) ? saturate(color.r * 12.92) : 1.055 * color.r = (color.r <= 0.00313066844250063) ? saturate(color.r * 12.92) : 1.055 *
saturate(pow(color.r, 1.0 / gamma)) - 0.055; saturate(pow(color.r, 1.0 / gamma)) - 0.055;
@ -114,21 +106,6 @@ float3 LinearToRGBGamma(float3 color, float gamma)
#define GammaCorrection(color, gamma) pow(color, gamma) #define GammaCorrection(color, gamma) pow(color, gamma)
#define InverseGammaCorrection(color, gamma) pow(color, 1.0/gamma) #define InverseGammaCorrection(color, gamma) pow(color, 1.0/gamma)
/*------------------------------------------------------------------------------
[VERTEX CODE SECTION]
------------------------------------------------------------------------------*/
//Not used - here for testing on custom builds.
VS_OUTPUT vs_main(VS_INPUT input)
{
VS_OUTPUT output;
output.p = input.p;
output.t = input.t;
return output;
}
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
[GAMMA PREPASS CODE SECTION] [GAMMA PREPASS CODE SECTION]
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
@ -152,7 +129,6 @@ float4 PreGammaPass(float4 color, float2 uv0)
[FXAA CODE SECTION] [FXAA CODE SECTION]
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#if (UHQ_FXAA == 1)
#if (SHADER_MODEL >= 0x500) #if (SHADER_MODEL >= 0x500)
#define FXAA_HLSL_5 1 #define FXAA_HLSL_5 1
#define FXAA_GATHER4_ALPHA 1 #define FXAA_GATHER4_ALPHA 1
@ -164,70 +140,6 @@ float4 PreGammaPass(float4 color, float2 uv0)
#define FXAA_GATHER4_ALPHA 0 #define FXAA_GATHER4_ALPHA 0
#endif #endif
#if (FxaaQuality == 4)
#define FxaaEdgeThreshold (0.033)
#define FxaaEdgeThresholdMin (0.00)
#define FXAA_QUALITY__PS 14
#define FXAA_QUALITY__P0 1.0
#define FXAA_QUALITY__P1 1.5
#define FXAA_QUALITY__P2 2.0
#define FXAA_QUALITY__P3 2.0
#define FXAA_QUALITY__P4 2.0
#define FXAA_QUALITY__P5 2.0
#define FXAA_QUALITY__P6 2.0
#define FXAA_QUALITY__P7 2.0
#define FXAA_QUALITY__P8 2.0
#define FXAA_QUALITY__P9 2.0
#define FXAA_QUALITY__P10 4.0
#define FXAA_QUALITY__P11 8.0
#define FXAA_QUALITY__P12 8.0
#elif (FxaaQuality == 3)
#define FxaaEdgeThreshold (0.125)
#define FxaaEdgeThresholdMin (0.0312)
#define FXAA_QUALITY__PS 12
#define FXAA_QUALITY__P0 1.0
#define FXAA_QUALITY__P1 1.5
#define FXAA_QUALITY__P2 2.0
#define FXAA_QUALITY__P3 2.0
#define FXAA_QUALITY__P4 2.0
#define FXAA_QUALITY__P5 2.0
#define FXAA_QUALITY__P6 2.0
#define FXAA_QUALITY__P7 2.0
#define FXAA_QUALITY__P8 2.0
#define FXAA_QUALITY__P9 2.0
#define FXAA_QUALITY__P10 4.0
#define FXAA_QUALITY__P11 8.0
#elif (FxaaQuality == 2)
#define FxaaEdgeThreshold (0.166)
#define FxaaEdgeThresholdMin (0.0625)
#define FXAA_QUALITY__PS 10
#define FXAA_QUALITY__P0 1.0
#define FXAA_QUALITY__P1 1.5
#define FXAA_QUALITY__P2 2.0
#define FXAA_QUALITY__P3 2.0
#define FXAA_QUALITY__P4 2.0
#define FXAA_QUALITY__P5 2.0
#define FXAA_QUALITY__P6 2.0
#define FXAA_QUALITY__P7 2.0
#define FXAA_QUALITY__P8 4.0
#define FXAA_QUALITY__P9 8.0
#elif (FxaaQuality == 1)
#define FxaaEdgeThreshold (0.250)
#define FxaaEdgeThresholdMin (0.0833)
#define FXAA_QUALITY__PS 8
#define FXAA_QUALITY__P0 1.0
#define FXAA_QUALITY__P1 1.5
#define FXAA_QUALITY__P2 2.0
#define FXAA_QUALITY__P3 2.0
#define FXAA_QUALITY__P4 2.0
#define FXAA_QUALITY__P5 2.0
#define FXAA_QUALITY__P6 4.0
#define FXAA_QUALITY__P7 12.0
#endif
#if (FXAA_HLSL_5 == 1) #if (FXAA_HLSL_5 == 1)
struct FxaaTex { SamplerState smpl; Texture2D tex; }; struct FxaaTex { SamplerState smpl; Texture2D tex; };
#define FxaaTexTop(t, p) t.tex.SampleLevel(t.smpl, p, 0.0) #define FxaaTexTop(t, p) t.tex.SampleLevel(t.smpl, p, 0.0)
@ -252,6 +164,22 @@ float4 PreGammaPass(float4 color, float2 uv0)
#define FxaaTexOff(t, p, o, r) tex2Dlod(t, float4(p + (o * r), 0, 0)) #define FxaaTexOff(t, p, o, r) tex2Dlod(t, float4(p + (o * r), 0, 0))
#endif #endif
#define FxaaEdgeThreshold 0.033
#define FxaaEdgeThresholdMin 0.00
#define FXAA_QUALITY__P0 1.0
#define FXAA_QUALITY__P1 1.5
#define FXAA_QUALITY__P2 2.0
#define FXAA_QUALITY__P3 2.0
#define FXAA_QUALITY__P4 2.0
#define FXAA_QUALITY__P5 2.0
#define FXAA_QUALITY__P6 2.0
#define FXAA_QUALITY__P7 2.0
#define FXAA_QUALITY__P8 2.0
#define FXAA_QUALITY__P9 2.0
#define FXAA_QUALITY__P10 4.0
#define FXAA_QUALITY__P11 8.0
#define FXAA_QUALITY__P12 8.0
float FxaaLuma(float4 rgba) float FxaaLuma(float4 rgba)
{ {
rgba.w = RGBLuminance(rgba.xyz); rgba.w = RGBLuminance(rgba.xyz);
@ -403,7 +331,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P2; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P2;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P2; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P2;
#if (FXAA_QUALITY__PS > 3)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -417,7 +344,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P3; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P3;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P3; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P3;
#if (FXAA_QUALITY__PS > 4)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -431,7 +357,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P4; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P4;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P4; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P4;
#if (FXAA_QUALITY__PS > 5)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -445,7 +370,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P5; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P5;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P5; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P5;
#if (FXAA_QUALITY__PS > 6)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -459,7 +383,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P6; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P6;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P6; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P6;
#if (FXAA_QUALITY__PS > 7)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -473,7 +396,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P7; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P7;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P7; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P7;
#if (FXAA_QUALITY__PS > 8)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -487,7 +409,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P8; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P8;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P8; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P8;
#if (FXAA_QUALITY__PS > 9)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -501,7 +422,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P9; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P9;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P9; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P9;
#if (FXAA_QUALITY__PS > 10)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -515,7 +435,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P10; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P10;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P10; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P10;
#if (FXAA_QUALITY__PS > 11)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -529,7 +448,6 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P11; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P11;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P11; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P11;
#if (FXAA_QUALITY__PS > 12)
if(doneNP) { if(doneNP) {
if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy)); if(!doneN) lumaEndN = FxaaLuma(FxaaTexTop(tex, posN.xy));
if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy)); if(!doneP) lumaEndP = FxaaLuma(FxaaTexTop(tex, posP.xy));
@ -542,27 +460,8 @@ float4 FxaaPixelShader(float2 pos, FxaaTex tex, float2 fxaaRcpFrame, float fxaaS
doneNP = (!doneN) || (!doneP); doneNP = (!doneN) || (!doneP);
if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P12; if(!doneP) posP.x += offNP.x * FXAA_QUALITY__P12;
if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P12; if(!doneP) posP.y += offNP.y * FXAA_QUALITY__P12;
} }}}}}}}}}}}
#endif
}
#endif
}
#endif
}
#endif
}
#endif
}
#endif
}
#endif
}
#endif
}
#endif
}
#endif
}
float dstN = posM.x - posN.x; float dstN = posM.x - posN.x;
float dstP = posP.x - posM.x; float dstP = posP.x - posM.x;
if(!horzSpan) dstN = posM.y - posN.y; if(!horzSpan) dstN = posM.y - posN.y;
@ -595,16 +494,17 @@ float4 FxaaPass(float4 FxaaColor : COLOR0, float2 uv0 : TEXCOORD0)
#if (SHADER_MODEL >= 0x400) #if (SHADER_MODEL >= 0x400)
tex.tex = Texture; tex.tex = Texture;
tex.smpl = TextureSampler; tex.smpl = TextureSampler;
Texture.GetDimensions(PixelSize.x, PixelSize.y); Texture.GetDimensions(PixelSize.x, PixelSize.y);
FxaaColor = FxaaPixelShader(uv0, tex, 1.0/PixelSize.xy, FxaaSubpixMax, FxaaEdgeThreshold, FxaaEdgeThresholdMin); FxaaColor = FxaaPixelShader(uv0, tex, 1.0/PixelSize.xy, FxaaSubpixMax, FxaaEdgeThreshold, FxaaEdgeThresholdMin);
#else #else
tex = TextureSampler; tex = TextureSampler;
FxaaColor = FxaaPixelShader(uv0, tex, PixelSize.xy, FxaaSubpixMax, FxaaEdgeThreshold, FxaaEdgeThresholdMin); FxaaColor = FxaaPixelShader(uv0, tex, PixelSize.xy, FxaaSubpixMax, FxaaEdgeThreshold, FxaaEdgeThresholdMin);
#endif #endif
return FxaaColor; return FxaaColor;
} }
#endif
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
[MAIN() & COMBINE PASS CODE SECTION] [MAIN() & COMBINE PASS CODE SECTION]
@ -616,26 +516,25 @@ PS_OUTPUT ps_main(VS_OUTPUT input)
#if (SHADER_MODEL >= 0x400) #if (SHADER_MODEL >= 0x400)
float4 color = Texture.Sample(TextureSampler, input.t); float4 color = Texture.Sample(TextureSampler, input.t);
color = PreGammaPass(color, input.t); color = PreGammaPass(color, input.t);
#if (UHQ_FXAA == 1)
color = FxaaPass(color, input.t); color = FxaaPass(color, input.t);
#endif
#else #else
float4 color = tex2D(TextureSampler, input.t); float4 color = tex2D(TextureSampler, input.t);
color = PreGammaPass(color, input.t);
#if (UHQ_FXAA == 1) color = PreGammaPass(color, input.t);
color = FxaaPass(color, input.t); color = FxaaPass(color, input.t);
#endif #endif
#endif
output.c = color; output.c = color;
return output; return output;
} }
/*------------------------------------------------------------------------------
[RECOVERY PS CODE SECTION]
------------------------------------------------------------------------------*/
PS_OUTPUT ps_recover(VS_OUTPUT input) PS_OUTPUT ps_recover(VS_OUTPUT input)
{ {
PS_OUTPUT output; PS_OUTPUT output;