id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-24 18:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ported advanced CRT shader by whkrmrgks0

Browse source
This commit is contained in:
Robert Beckebans 2024-08-07 22:35:16 +02:00
parent e66754b7f3
commit 25e2208f68
7 changed files with 399 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
neo/d3xp/menus/MenuScreen_Shell_SystemOptions.cpp
View file

@ -627,8 +627,8 @@ void idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings::AdjustFi
}
case SYSTEM_FIELD_CRT_POSTFX:
{
static const int numValues = 3;
static const int values[numValues] = { 0, 1, 2 };
static const int numValues = 4;
static const int values[numValues] = { 0, 1, 2, 3 };
r_useCRTPostFX.SetInteger( AdjustOption( r_useCRTPostFX.GetInteger(), values, numValues, adjustAmount ) );
break;
}
@ -830,9 +830,9 @@ idSWFScriptVar idMenuScreen_Shell_SystemOptions::idMenuDataSource_SystemSettings
static const char* values[numValues] =
{
"#str_swf_disabled",
"Mattias CRT",
"Newpixie CRT",
"Zfast CRT",
"Mattias",
"Newpixie",
"Easymode",
};
return values[ r_useCRTPostFX.GetInteger() ];

47
neo/renderer/RenderBackend.cpp
View file

@ -6459,7 +6459,7 @@ void idRenderBackend::PostProcess( const void* data )
void idRenderBackend::CRTPostProcess()
{
#define CRT_QUARTER_RES 1
#define CRT_QUARTER_RES 0
nvrhi::ObjectType commandObject = nvrhi::ObjectTypes::D3D12_GraphicsCommandList;
if( deviceManager->GetGraphicsAPI() == nvrhi::GraphicsAPI::VULKAN )
@ -6481,12 +6481,23 @@ void idRenderBackend::CRTPostProcess()
GL_Viewport( 0, 0, screenWidth, screenHeight );
GL_Scissor( 0, 0, screenWidth, screenHeight );
#if CRT_QUARTER_RES
#if defined(USE_DOOMCLASSIC)
bool quarterRes = r_useCRTPostFX.GetInteger() == 3 && ( !game->Shell_IsActive() && !game->IsPDAOpen() || ( !console->Active() && ( common->GetCurrentGame() == DOOM_CLASSIC || common->GetCurrentGame() == DOOM2_CLASSIC ) ) );
#else
bool quarterRes = false; //r_useCRTPostFX.GetInteger() == 3 && ( !game->Shell_IsActive() && !game->IsPDAOpen() && !console->Active() );
#endif
#else
bool quarterRes = false;
#endif
if( r_useCRTPostFX.GetInteger() > 0 )
{
OPTICK_GPU_EVENT( "Render_CRTPostFX" );
#if CRT_QUARTER_RES
if( r_useCRTPostFX.GetInteger() == 3 )
if( quarterRes )
{
// downscale to retro resolution
BlitParameters blitParms;
@ -6509,8 +6520,6 @@ void idRenderBackend::CRTPostProcess()
blitParms.targetViewport = nvrhi::Viewport( renderSystem->GetWidth(), renderSystem->GetHeight() );
commonPasses.BlitTexture( commandList, blitParms, &bindingCache );
renderProgManager.BindShader_CrtEasyMode();
GL_SelectTexture( 0 );
globalImages->smaaBlendImage->Bind();
}
@ -6530,25 +6539,21 @@ void idRenderBackend::CRTPostProcess()
}
else
{
BlitParameters blitParms;
blitParms.sourceTexture = ( nvrhi::ITexture* )globalImages->ldrImage->GetTextureID();
blitParms.targetFramebuffer = globalFramebuffers.smaaBlendFBO->GetApiObject();
blitParms.targetViewport = nvrhi::Viewport( renderSystem->GetWidth(), renderSystem->GetHeight() );
commonPasses.BlitTexture( commandList, blitParms, &bindingCache );
renderProgManager.BindShader_CrtEasyMode();
}
// screen power of two correction factor
idVec4 sourceSizeParam;
#if CRT_QUARTER_RES
sourceSizeParam.x = renderSystem->GetWidth() / 4;
sourceSizeParam.y = renderSystem->GetHeight() / 4;
#else
sourceSizeParam.x = screenWidth;
sourceSizeParam.y = screenHeight;
#endif
if( quarterRes )
{
sourceSizeParam.x = renderSystem->GetWidth() / 4;
sourceSizeParam.y = renderSystem->GetHeight() / 4;
}
else
{
sourceSizeParam.x = screenWidth;
sourceSizeParam.y = screenHeight;
}
sourceSizeParam.z = 1.0f / sourceSizeParam.x;
sourceSizeParam.w = 1.0f / sourceSizeParam.y;
@ -6580,9 +6585,9 @@ void idRenderBackend::CRTPostProcess()
// JINC2 interpolation settings
idVec4 jincParms;
jincParms.x = 0.44;
jincParms.y = 0.82;
jincParms.z = 0.5;
jincParms.x = 0.44f;
jincParms.y = 0.82f;
jincParms.z = 0.5f;
jincParms.w = 0;
SetFragmentParm( RENDERPARM_DIFFUSEMODIFIER, jincParms.ToFloatPtr() );

2
neo/renderer/RenderProgs.cpp
View file

@ -540,7 +540,7 @@ void idRenderProgManager::Init( nvrhi::IDevice* device )
{ BUILTIN_POSTPROCESS_RETRO_PSX, "builtin/post/retro_ps1", "", {}, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_POST_PROCESS_FINAL },
{ BUILTIN_CRT_MATTIAS, "builtin/post/crt_mattias", "", {}, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_POST_PROCESS_CRT },
{ BUILTIN_CRT_NUPIXIE, "builtin/post/crt_newpixie", "", {}, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_POST_PROCESS_CRT },
{ BUILTIN_CRT_EASYMODE, "builtin/post/crt_easymode", "", {}, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_POST_PROCESS_FINAL }, // FINAL for linear filtering
{ BUILTIN_CRT_EASYMODE, "builtin/post/crt_advanced", "", {}, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_POST_PROCESS_FINAL }, // FINAL for linear filtering
{ BUILTIN_SCREEN, "builtin/post/screen", "", {}, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DEFAULT },
{ BUILTIN_TONEMAP, "builtin/post/tonemap", "", { { "BRIGHTPASS", "0" }, { "HDR_DEBUG", "0"} }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DEFAULT },

307
neo/shaders/builtin/post/crt_advanced.ps.hlsl Normal file
View file

@ -0,0 +1,307 @@
/*
===========================================================================
Doom 3 BFG Edition GPL Source Code
Copyright (C) 2022 whkrmrgks0
Copyright (C) 2024 Robert Beckebans
This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").
Doom 3 BFG Edition Source Code is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Doom 3 BFG Edition Source Code is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Doom 3 BFG Edition Source Code. If not, see <http://www.gnu.org/licenses/>.
In addition, the Doom 3 BFG Edition Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 BFG Edition Source Code. If not, please request a copy in writing from id Software at the address below.
If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
===========================================================================
*/
#include <global_inc.hlsl>
// *INDENT-OFF*
Texture2D t_CurrentRender : register( t0 VK_DESCRIPTOR_SET( 0 ) );
Texture2D t_BlueNoise : register( t1 VK_DESCRIPTOR_SET( 0 ) );
SamplerState s_LinearClamp : register(s0 VK_DESCRIPTOR_SET( 1 ) );
SamplerState s_LinearWrap : register(s1 VK_DESCRIPTOR_SET( 1 ) ); // blue noise 256
struct PS_IN
{
float4 position : SV_Position;
float2 texcoord0 : TEXCOORD0_centroid;
};
struct PS_OUT
{
float4 color : SV_Target0;
};
// *INDENT-ON*
#define RESOLUTION_DIVISOR 4.0
/*
#pragma parameter cus "CRT curvature" 0.15 0.0 1.0 0.01
#pragma parameter vstr "Vignette strength" 0.05 0.0 1.0 0.01
#pragma parameter marginv "Display margin" 0.02 0.0 0.1 0.005
#pragma parameter dts "Phosper size" 1.0 1.0 3.0 1.0
#pragma parameter AAz "De-moire conv iteration" 64.0 2.0 256.0 1.0
#pragma parameter vex "De-moire conv size" 2.0 0.0 4.0 0.1
#pragma parameter capa "Horizontal convolution size" 1.0 0.0 4.0 0.1
#pragma parameter capaiter "Horizontal convolution iterations" 5.0 1.0 20.0 1.0
#pragma parameter capashape "Horizontal convololution kernel shape" 3.0 1.0 40.0 0.1
#pragma parameter scl "Scnaline count, set 0 to match with input" 240.0 0.0 1080.0 1.0
#pragma parameter gma "Gamma correction" 1.0 0.1 4.0 0.1
#pragma parameter sling "line bleed" 2.0 1.0 2.0 0.1
This shader features:
1x1 to whatever size you want
Scanline width modulation
Customisable scanlines
Customisable curvature
Customisable vignette
Customisable capacitance artifact
Customisable horizontal pre-sharpen filter
Phosper pattern without any dimming
Anti moire convolution filter
*/
// CRT curvature
//static const float cus = 0.1;
// Vignette strength
static const float vstr = 0.05;
// Display margin
static const float marginv = 0.01; // 0.02
// Phosper size (should be an integer)
static const float dts = 1.0;
// De-moire convolution iteration (if you see moire, up this value)
static const float AAz = 64.0;
// De-moire convolution width (don't touch if you have no idea)
static const float vex = 2.0;
// Capacitance (scanline horizontal blur)
static const float capa = 0.5;
// Capacitance iteration
static const float capaiter = 5.0;
// Capacitance IR shape parameter
static const float capashape = 3.0;
// Scanline count
//static const float scl = 240.0;
// Gamma correction
static const float gma = 1.0;
// Line bleed
static const float sling = 2.0;
/*
struct Params
{
float cus; // CRT curvature
float vstr; // Vignette strength
float marginv; // Display margin
float dts; // Phosper size
float AAz; // De-moire conv iteration
float vex; // De-moire conv size
float capa; // Horizontal convolution size
float capaiter; // Horizontal convolution iterations
float capashape; // Horizontal convolution kernel shape
float scl; // Scanline count, set 0 to match with input
float gma; // Gamma correction
float sling; // line bleed
};
*/
#define tau 6.28318530718
#define cr float2(4.0, 0.0)
#define cb float2(2.0, 0.0)
#define cg float2(0.0, 0.0)
#define cw float2(3.0, 1.0)
#if 1
float crt_sawtooth( float inp )
{
return inp - floor( inp );
//return frac(inp) * 2.0 - 1.0;
}
#endif
float crt_square( float zed, float marchpoint, float floaz )
{
return step( crt_sawtooth( zed / floaz ), marchpoint / floaz );
}
float crt_triangle( float zed )
{
return abs( crt_sawtooth( zed + 0.5 ) - 0.5 ) * 2.0;
}
// pixelgrid mask
float grd( float2 uv, float2 disp )
{
uv += disp * dts;
uv /= dts;
return crt_square( uv.x, 2.0, 6.0 ) * crt_square( uv.y, 1.0, 2.0 );
}
float3 tpscany( float3 bef, float3 ucj, float3 dcj, float temp )
{
float3 scan = _float3( 0.0 );
scan += max( ( crt_triangle( temp ) - 1.0 + ( bef * sling ) ), 0.0 );
scan += max( ( clamp( 0.0, 1.0, temp * 2.0 - 1.0 ) - 2.0 ) + ( ucj * sling ), 0.0 );
scan += max( ( clamp( 0.0, 1.0, -( temp * 2.0 - 1.0 ) ) - 2.0 ) + ( dcj * sling ), 0.0 );
return scan / ( sling * 0.5 );
}
// nonlinear distortion
void pinc( float2 uv, inout float2 uv2, inout float mxbf, inout float vign, float ar )
{
float cus = 0.0;
if( rpWindowCoord.x > 0.0 )
{
cus = 0.1;
}
uv2 = ( uv * _float2( 2.0 ) - _float2( 1.0 ) ) * float2( ( 1.0 + marginv ), ( 1.0 + marginv * ar ) );
uv2 = float2( uv2.x / ( ( cos( abs( uv2.y * cus ) * tau / 4.0 ) ) ), uv2.y / ( ( cos( abs( uv2.x * cus * ar ) * tau / 4.0 ) ) ) );
float2 uvbef = abs( uv2 ) - _float2( 1.0 ); //boarder
mxbf = max( uvbef.x, uvbef.y );
vign = max( uvbef.x * uvbef.y, 0.0 );
uv2 = ( uv2 + _float2( 1.0 ) ) * _float2( 0.5 ); //recoordination
}
float scimpresp( float range ) //scanline IR
{
return sin( pow( range, capashape ) * tau ) + 1.0;
}
void main( PS_IN fragment, out PS_OUT result )
{
// revised version from RetroArch
/*
Params params;
params.cus = 0.15;
params.vstr = 0.05;
params.marginv = 0.02;
params.dts = 1.0;
params.AAz = 64.0;
params.vex = 2.0;
params.capa = 1.0;
params.capaiter = 5.0;
params.capashape = 3.0;
params.scl = 240.0;
params.gma = 1.0;
params.sling = 2.0;
*/
float4 outputSize;
outputSize.xy = rpWindowCoord.zw;
outputSize.zw = float2( 1.0, 1.0 ) / rpWindowCoord.zw;
float4 sourceSize = rpScreenCorrectionFactor;
float2 vTexCoord = ( fragment.texcoord0.xy );
//vTexCoord.y = 1.0 - vTexCoord.y;
float2 uv2;
float mxbf, vign;
const float scl = outputSize.y / 2.0;
float scanline = ( 1.0 - min( scl, 1.0 ) ) * sourceSize.y + scl;
float2 ratd = vTexCoord * outputSize.xy;
float2 uv = uv2 = vTexCoord;
pinc( uv, uv2, mxbf, vign, outputSize.x / outputSize.y );
float2 nuv = uv2;
float2 nuvyud = float2( floor( nuv.y * scanline - 1.0 ) / scanline, floor( nuv.y * scanline + 1.0 ) / scanline );
nuv.y = floor( nuv.y * scanline ) / scanline;
float3 bef = _float3( 0.0 );
float3 ucj = _float3( 0.0 );
float3 dcj = _float3( 0.0 );
float capatemp, capainteg = 0.0;
// RB: workaround for stupid compiler bug
//#if 0
// for( float i = -capaiter / 2.0; i <= ( capaiter / 2.0 ); i++ )
//#else
const float capaVal[5] = { -2.5, -1.5, 0.5, 1.5, 2.5 };
for( int s = 0; s < 5; s++ )
{
float i = capaVal[s];
//#endif
// RB: avoid entering 0
capatemp = scimpresp( ( i + capaiter / 2.0 ) / capaiter * 1.0001 );
capainteg += capatemp;
bef += t_CurrentRender.Sample( s_LinearWrap, float2( crt_sawtooth( nuv.x - ( capa / ( scanline * i ) ) / ( capaiter / 2.0 ) ), nuv.y ) ).xyz * capatemp;
ucj += t_CurrentRender.Sample( s_LinearWrap, float2( crt_sawtooth( nuv.x - ( capa / ( scanline * i ) ) / ( capaiter / 2.0 ) ), nuvyud.y ) ).xyz * capatemp;
dcj += t_CurrentRender.Sample( s_LinearWrap, float2( crt_sawtooth( nuv.x - ( capa / ( scanline * i ) ) / ( capaiter / 2.0 ) ), nuvyud.x ) ).xyz * capatemp;
}
dcj /= capainteg;
bef /= capainteg;
ucj /= capainteg;
float3 scan = _float3( 0.0 );
float temp;
float snippet;
float integral = 0.0;
for( float a = -AAz / 2.0; a <= AAz / 2.0 ; a++ )
{
snippet = ( AAz / 2.0 - abs( a ) ) / AAz / 2.0;
integral += snippet;
temp = crt_sawtooth( uv2.y * scanline );
scan += tpscany( bef, ucj, dcj, temp + ( a / AAz * 2.0 ) * vex / outputSize.y * scanline ) * snippet; //antimoire convolution
}
scan /= integral;
float brd = step( mxbf, 0.0 );
vign = pow( vign, vstr );
float3 grid = float3( grd( ratd, cr ), grd( ratd, cg ), grd( ratd, cb ) );
grid += float3( grd( ratd, cr + cw ), grd( ratd, cg + cw ), grd( ratd, cb + cw ) );
float mask = brd * vign;
scan /= sling;
scan = pow( scan, _float3( 0.5 ) );
scan = pow( scan, _float3( 1.0 + 1.0 / 3.0 ) );
scan = pow( scan, _float3( gma ) );
float3 grided = scan * grid * 3.0;
float3 final = min( float3( lerp( grided, scan, scan ) ), _float3( 1.0 ) ) * mask;
//final = t_CurrentRender.Sample( s_LinearClamp, nuv ).xyz;
//final = _float3( 1.0 ) * mask;
//final = float3( nuv.x, nuv.y, 0.0 );
//final = float3( nuvyud.x, nuvyud.y, 0.0 );
//final = grid;
//final = bef;
result.color = float4( final, 1.0 );
}

55
neo/shaders/builtin/post/crt_advanced.vs.hlsl Normal file
View file

@ -0,0 +1,55 @@
/*
===========================================================================
Doom 3 BFG Edition GPL Source Code
Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").
Doom 3 BFG Edition Source Code is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Doom 3 BFG Edition Source Code is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Doom 3 BFG Edition Source Code. If not, see <http://www.gnu.org/licenses/>.
In addition, the Doom 3 BFG Edition Source Code is also subject to certain additional terms. You should have received a copy of these additional terms immediately following the terms and conditions of the GNU General Public License which accompanied the Doom 3 BFG Edition Source Code. If not, please request a copy in writing from id Software at the address below.
If you have questions concerning this license or the applicable additional terms, you may contact in writing id Software LLC, c/o ZeniMax Media Inc., Suite 120, Rockville, Maryland 20850 USA.
===========================================================================
*/
#include "global_inc.hlsl"
// *INDENT-OFF*
struct VS_IN
{
float4 position : POSITION;
float2 texcoord : TEXCOORD0;
float4 normal : NORMAL;
float4 tangent : TANGENT;
float4 color : COLOR0;
float4 color2 : COLOR1;
};
struct VS_OUT {
float4 position : SV_Position;
float2 texcoord0 : TEXCOORD0_centroid;
};
// *INDENT-ON*
void main( VS_IN vertex, out VS_OUT result )
{
result.position = vertex.position;
result.position.y = -result.position.y;
result.texcoord0 = vertex.texcoord;
}

6
neo/shaders/builtin/post/crt_easymode.ps.hlsl
View file

@ -122,7 +122,7 @@ float2 curve( float2 uv, float curvature )
return uv;
}
#if 0
#if 1
/*
Bicubic Catmull-Rom 5-taps (Fast) - ported by Hyllian - 2024
@ -195,7 +195,7 @@ float3 get_blurred_pixel( float2 vTexCoord, float4 sourceSize )
return float3( ( Ct + Cl + Cc + Cr + Cb ) * WeightMultiplier );
}
#elif 1
#elif 0
/*
Bicubic B-Spline 4-taps (Fast) - ported by Hyllian - 2024
@ -262,7 +262,7 @@ float3 get_blurred_pixel( float2 vTexCoord, float4 sourceSize )
return float3( Ctl + Ctr + Cbl + Cbr );
}
#elif 1
#elif 0
/*
Hyllian's jinc windowed-jinc 2-lobe with anti-ringing Shader

2
neo/shaders/shaders.cfg
View file

@ -64,6 +64,8 @@ builtin/post/retro_genesis.vs.hlsl -T vs
builtin/post/retro_genesis.ps.hlsl -T ps
builtin/post/retro_ps1.vs.hlsl -T vs
builtin/post/retro_ps1.ps.hlsl -T ps
builtin/post/crt_advanced.vs.hlsl -T vs
builtin/post/crt_advanced.ps.hlsl -T ps
builtin/post/crt_mattias.vs.hlsl -T vs
builtin/post/crt_mattias.ps.hlsl -T ps
builtin/post/crt_newpixie.vs.hlsl -T vs