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

Removed old obsolete SSAO minify shader

Browse source
This commit is contained in:
Robert Beckebans 2023-02-11 14:31:26 +01:00
parent 5de9dd9b68
commit b4d2b03079
5 changed files with 0 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/renderer/RenderProgs.cpp
View file

@ -560,8 +560,6 @@ void idRenderProgManager::Init( nvrhi::IDevice* device )
{ BUILTIN_AMBIENT_OCCLUSION_AND_OUTPUT, "builtin/SSAO/AmbientOcclusion_AO", "_write", { { "BRIGHTPASS", "1" } }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DRAW_AO },
{ BUILTIN_AMBIENT_OCCLUSION_BLUR, "builtin/SSAO/AmbientOcclusion_blur", "", { { "BRIGHTPASS", "0" } }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DRAW_AO },
{ BUILTIN_AMBIENT_OCCLUSION_BLUR_AND_OUTPUT, "builtin/SSAO/AmbientOcclusion_blur", "_write", { { "BRIGHTPASS", "1" } }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DRAW_AO },
{ BUILTIN_AMBIENT_OCCLUSION_MINIFY, "builtin/SSAO/AmbientOcclusion_minify", "", { { "BRIGHTPASS", "0" } }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DRAW_AO1 },
{ BUILTIN_AMBIENT_OCCLUSION_RECONSTRUCT_CSZ, "builtin/SSAO/AmbientOcclusion_minify", "_mip0", { { "BRIGHTPASS", "1" } }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DRAW_AO1 },
{ BUILTIN_DEEP_GBUFFER_RADIOSITY_SSGI, "builtin/SSGI/DeepGBufferRadiosity_radiosity", "", { }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DEFAULT },
{ BUILTIN_DEEP_GBUFFER_RADIOSITY_BLUR, "builtin/SSGI/DeepGBufferRadiosity_blur", "", { }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DEFAULT },
{ BUILTIN_DEEP_GBUFFER_RADIOSITY_BLUR_AND_OUTPUT, "builtin/SSGI/DeepGBufferRadiosity_blur", "_write", { }, false, SHADER_STAGE_DEFAULT, LAYOUT_DRAW_VERT, BINDING_LAYOUT_DEFAULT },

19
neo/renderer/RenderProgs.h
View file

@ -392,8 +392,6 @@ enum
BUILTIN_AMBIENT_OCCLUSION_AND_OUTPUT,
BUILTIN_AMBIENT_OCCLUSION_BLUR,
BUILTIN_AMBIENT_OCCLUSION_BLUR_AND_OUTPUT,
BUILTIN_AMBIENT_OCCLUSION_MINIFY,
BUILTIN_AMBIENT_OCCLUSION_RECONSTRUCT_CSZ,
BUILTIN_DEEP_GBUFFER_RADIOSITY_SSGI,
BUILTIN_DEEP_GBUFFER_RADIOSITY_BLUR,
@ -915,16 +913,6 @@ public:
BindShader_Builtin( BUILTIN_AMBIENT_OCCLUSION_BLUR_AND_OUTPUT );
}
void BindShader_AmbientOcclusionMinify()
{
BindShader_Builtin( BUILTIN_AMBIENT_OCCLUSION_MINIFY );
}
void BindShader_AmbientOcclusionReconstructCSZ()
{
BindShader_Builtin( BUILTIN_AMBIENT_OCCLUSION_RECONSTRUCT_CSZ );
}
void BindShader_DeepGBufferRadiosity()
{
BindShader_Builtin( BUILTIN_DEEP_GBUFFER_RADIOSITY_SSGI );
@ -940,13 +928,6 @@ public:
BindShader_Builtin( BUILTIN_DEEP_GBUFFER_RADIOSITY_BLUR_AND_OUTPUT );
}
#if 0
void BindShader_ZCullReconstruct()
{
BindShader_Builtin( BUILTIN_ZCULL_RECONSTRUCT );
}
#endif
void BindShader_Bink()
{
BindShader_Builtin( BUILTIN_BINK );

87
neo/shaders/builtin/SSAO/AmbientOcclusion_minify.ps.hlsl
View file

@ -1,87 +0,0 @@
/**
\file AmbientOcclusion_minify.pix
\author Morgan McGuire and Michael Mara, NVIDIA Research
Open Source under the "BSD" license: http://www.opensource.org/licenses/bsd-license.php
Copyright (c) 2011-2012, NVIDIA
Copyright (c) 2016 Robert Beckebans ( id Tech 4.x integration )
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "global_inc.hlsl"
// *INDENT-OFF*
Texture2D t_ViewDepth : register( t0 VK_DESCRIPTOR_SET( 1 ) );
SamplerState LinearSampler : register( s0 VK_DESCRIPTOR_SET( 2 ) );
struct PS_IN
{
float4 position : SV_Position;
float2 texcoord0 : TEXCOORD0_centroid;
};
struct PS_OUT
{
float4 color : SV_Target0;
};
// *INDENT-ON*
//#extension GL_EXT_gpu_shader4 : enable
//#expect USE_PEELED_DEPTH_BUFFER "binary"
#if 0 //( USE_PEELED_DEPTH_BUFFER != 0 )
#define mask rg
#else
#define mask r
#endif
float reconstructCSZ( float d )
{
//return clipInfo[0] / (clipInfo[1] * d + clipInfo[2]);
// infinite far perspective matrix
return -3.0 / ( -1.0 * d + 1.0 );
//d = d * 2.0 - 1.0;
//return -rpProjectionMatrixZ.w / ( -rpProjectionMatrixZ.z - d );
}
void main( PS_IN fragment, out PS_OUT result )
{
#if defined(BRIGHTPASS)
float2 ssC = fragment.texcoord0;
float depth = t_ViewDepth.Sample( LinearSampler, ssC ).r;
//depth = reconstructCSZ( depth );
result.color.mask = depth;
#else
//int2 ssP = int2( gl_FragCoord.xy );
int2 ssP = int2( fragment.texcoord0 * rpScreenCorrectionFactor.zw );
int previousMIPNumber = int( rpJitterTexScale.x );
// Rotated grid subsampling to avoid XY directional bias or Z precision bias while downsampling.
// On DX9, the bit-and can be implemented with floating-point modulo
//result.color.mask = texture( samp0, clamp( ssP * 2 + int2( ssP.y & 1, ssP.x & 1 ), int2( 0 ), textureSize( samp0, previousMIPNumber ) - int2( 1 ) ) * rpScreenCorrectionFactor.xy, previousMIPNumber ).mask;
int2 ssc = clamp( ssP * 2 + int2( ssP.y & 1, ssP.x & 1 ), int2( 0 ), textureSize( t_ViewDepth, previousMIPNumber ) - int2( 1 ) );
result.color.mask = texelFetch( t_ViewDepth, ssc, previousMIPNumber ).mask;
//result.color.mask = texelFetch2D( samp0, int3( ssP * 2 + int2( ( ssP.y & 1 ) ^ 1, ( ssP.x & 1 ) ^ 1 ), 0 ) );
// result.color.mask = texelFetch( samp0, ssP, 0 ).r;
//float2 ssC = float2( ssP * 2 + int2( ( ssP.y & 1 ) ^ 1, ( ssP.x & 1 ) ^ 1 ) ) * rpScreenCorrectionFactor.xy;
//float2 ssC = float2( ssP ) * rpScreenCorrectionFactor.xy;
//float2 ssC = fragment.texcoord0;
//float depth = tex2D( samp0, ssC ).r;
result.color.mask = 0.5;
#endif
}

54
neo/shaders/builtin/SSAO/AmbientOcclusion_minify.vs.hlsl
View file

@ -1,54 +0,0 @@
/*
===========================================================================
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.texcoord0 = vertex.texcoord;
}

2
neo/shaders/shaders.cfg
View file

@ -80,8 +80,6 @@ builtin/SSAO/AmbientOcclusion_AO.vs.hlsl -T vs_5_0 -D BRIGHTPASS={0,1}
builtin/SSAO/AmbientOcclusion_AO.ps.hlsl -T ps_5_0 -D BRIGHTPASS={0,1}
builtin/SSAO/AmbientOcclusion_blur.vs.hlsl -T vs_5_0 -D BRIGHTPASS={0,1}
builtin/SSAO/AmbientOcclusion_blur.ps.hlsl -T ps_5_0 -D BRIGHTPASS={0,1}
builtin/SSAO/AmbientOcclusion_minify.vs.hlsl -T vs_5_0 -D BRIGHTPASS={0,1}
builtin/SSAO/AmbientOcclusion_minify.ps.hlsl -T ps_5_0 -D BRIGHTPASS={0,1}
builtin/SSGI/DeepGBufferRadiosity_blur.vs.hlsl -T vs_5_0
builtin/SSGI/DeepGBufferRadiosity_blur.ps.hlsl -T ps_5_0