refactor: remove DeferredShared (doodlum#673)

* refactor: force include path to Shaders folder

no relative include is allowed any more

* fix: prevent delete nullptr

* fix: add missing sss include

* refactor: remove DeferredShared

replaced with SharedData

features/Dynamic Cubemaps/Shaders/DynamicCubemaps/UpdateCubemapCS.hlsl

@@ -1,7 +1,7 @@
 #include "Common/Color.hlsli"
 #include "Common/Constants.hlsli"
-#include "Common/DeferredShared.hlsli"
 #include "Common/FrameBuffer.hlsli"
+#include "Common/SharedData.hlsli"
 #include "Common/VR.hlsli"
 
 RWTexture2DArray<float4> DynamicCubemap : register(u0);
@@ -97,7 +97,7 @@ float smoothbumpstep(float edge0, float edge1, float x)
 		uv = Stereo::ConvertToStereoUV(uv, 0);
 
 		float depth = DepthTexture.SampleLevel(LinearSampler, uv, 0);
-		float linearDepth = DeferredShared::GetScreenDepth(depth);
+		float linearDepth = SharedData::GetScreenDepth(depth);
 
 		if (linearDepth > 16.5) {  // Ignore objects which are too close
 			half4 positionCS = half4(2 * half2(uv.x, -uv.y + 1) - 1, depth, 1);

features/Screen Space GI/Shaders/ScreenSpaceGI/common.hlsli

@@ -20,7 +20,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "Common/DeferredShared.hlsli"
+#include "Common/SharedData.hlsli"
 
 cbuffer SSGICB : register(b1)
 {

features/Screen-Space Shadows/Shaders/ScreenSpaceShadows/RaymarchCS.hlsl

@@ -1,5 +1,5 @@
 
-#include "Common/DeferredShared.hlsli"
+#include "Common/SharedData.hlsli"
 
 #include "ScreenSpaceShadows/bend_sss_gpu.hlsli"
 

features/Skylighting/Shaders/Skylighting/Skylighting.hlsli

@@ -1,31 +1,10 @@
-// Define SL_INCL_STRUCT and SL_INCL_METHODS to include different parts
-// Because this file is included by both forward and deferred shaders
+#include "Common/Random.hlsli"
+#include "Common/SharedData.hlsli"
+#include "Common/Spherical Harmonics/SphericalHarmonics.hlsli"
 
-#ifdef SL_INCL_STRUCT
-struct SkylightingSettings
-{
-	row_major float4x4 OcclusionViewProj;
-	float4 OcclusionDir;
-
-	float4 PosOffset;   // xyz: cell origin in camera model space
-	uint4 ArrayOrigin;  // xyz: array origin
-	int4 ValidMargin;
-
-	float MinDiffuseVisibility;
-	float MinSpecularVisibility;
-	uint pad[2];
-};
-
-#endif
-
-#ifdef SL_INCL_METHODS
-
-#	include "Common/Random.hlsli"
-#	include "Common/Spherical Harmonics/SphericalHarmonics.hlsli"
-
-#	ifdef PSHADER
+#ifdef PSHADER
 Texture3D<sh2> SkylightingProbeArray : register(t29);
-#	endif
+#endif
 
 namespace Skylighting
 {
@@ -149,6 +128,4 @@ namespace Skylighting
 
 		return result;
 	}
-}
-
-#endif
+}

features/Skylighting/Shaders/Skylighting/UpdateProbesCS.hlsl

@@ -1,15 +1,5 @@
-#define SL_INCL_STRUCT
 #include "Skylighting/Skylighting.hlsli"
 
-#include "Common/DeferredShared.hlsli"
-#include "Common/FrameBuffer.hlsli"
-#include "Common/Spherical Harmonics/SphericalHarmonics.hlsli"
-
-cbuffer SkylightingCB : register(b1)
-{
-	SkylightingSettings settings;
-};
-
 Texture2D<unorm float> srcOcclusionDepth : register(t0);
 
 RWTexture3D<sh2> outProbeArray : register(u0);
@@ -24,6 +14,7 @@ SamplerState samplerPointClamp : register(s0);
 								: SV_DispatchThreadID) {
 	const float fadeInThreshold = 255;
 	const static sh2 unitSH = float4(sqrt(4.0 * shPI), 0, 0, 0);
+	const SkylightingSettings settings = skylightingSettings;
 
 	uint3 cellID = (int3(dtid) - settings.ArrayOrigin.xyz) % ARRAY_DIM;
 	bool isValid = all(cellID >= max(0, settings.ValidMargin.xyz)) && all(cellID <= ARRAY_DIM - 1 + min(0, settings.ValidMargin.xyz));  // check if the cell is newly added

features/Subsurface Scattering/Shaders/SubsurfaceScattering/SeparableSSS.hlsli

@@ -108,7 +108,7 @@ float4 SSSSBlurCS(
 
 	// Fetch linear depth of current pixel:
 	float depthM = DepthTexture[DTid.xy].r;
-	depthM = DeferredShared::GetScreenDepth(depthM);
+	depthM = SharedData::GetScreenDepth(depthM);
 
 	float2 profile = humanProfile ? HumanProfile.xy : BaseProfile.xy;
 	uint kernelOffset = humanProfile ? SSSS_N_SAMPLES : 0;
@@ -161,7 +161,7 @@ float4 SSSSBlurCS(
 #endif
 
 		float depth = DepthTexture[coords].r;
-		depth = DeferredShared::GetScreenDepth(depth);
+		depth = SharedData::GetScreenDepth(depth);
 
 		// If the difference in depth is huge, we lerp color back to "colorM":
 		float s = saturate(profile.y * distanceToProjectionWindow * abs(depthM - depth));

features/Subsurface Scattering/Shaders/SubsurfaceScattering/SeparableSSSCS.hlsl

@@ -16,8 +16,8 @@ cbuffer PerFrameSSS : register(b1)
 
 #include "Common/Color.hlsli"
 #include "Common/Constants.hlsli"
-#include "Common/DeferredShared.hlsli"
 #include "Common/Random.hlsli"
+#include "Common/SharedData.hlsli"
 
 #include "SubsurfaceScattering/SeparableSSS.hlsli"
 

package/Shaders/AmbientCompositeCS.hlsl

@@ -1,22 +1,15 @@
 #include "Common/Color.hlsli"
-#include "Common/DeferredShared.hlsli"
 #include "Common/FrameBuffer.hlsli"
 #include "Common/GBuffer.hlsli"
+#include "Common/SharedData.hlsli"
 #include "Common/VR.hlsli"
 
 Texture2D<unorm half3> AlbedoTexture : register(t0);
 Texture2D<unorm half3> NormalRoughnessTexture : register(t1);
 
 #if defined(SKYLIGHTING)
-#	define SL_INCL_STRUCT
-#	define SL_INCL_METHODS
 #	include "Skylighting/Skylighting.hlsli"
 
-cbuffer SkylightingCB : register(b1)
-{
-	SkylightingSettings skylightingSettings;
-};
-
 Texture2D<unorm float> DepthTexture : register(t2);
 Texture3D<sh2> SkylightingProbeArray : register(t3);
 #endif
@@ -49,7 +42,7 @@ RWTexture2D<half3> DiffuseAmbientRW : register(u1);
 
 	half3 normalWS = normalize(mul(CameraViewInverse[eyeIndex], half4(normalVS, 0)).xyz);
 
-	half3 directionalAmbientColor = mul(DirectionalAmbient, half4(normalWS, 1.0));
+	half3 directionalAmbientColor = mul(DirectionalAmbientShared, half4(normalWS, 1.0));
 
 	half3 linAlbedo = Color::GammaToLinear(albedo) / Color::AlbedoPreMult;
 	half3 linDirectionalAmbientColor = Color::GammaToLinear(directionalAmbientColor) / Color::LightPreMult;

package/Shaders/Common/SharedData.hlsli

@@ -2,10 +2,10 @@
 #define SHARED_DATA
 
 #include "Common/Constants.hlsli"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/VR.hlsli"
 
-#if defined(PSHADER)
-
+#if defined(PSHADER) || defined(COMPUTESHADER)
 cbuffer SharedData : register(b5)
 {
 	float4 WaterData[25];
@@ -16,8 +16,10 @@ cbuffer SharedData : register(b5)
 	float4 BufferDim;
 	float Timer;
 	uint FrameCount;
+	uint FrameCountAlwaysActive;
 	bool InInterior;  // If the area lacks a directional shadow light e.g. the sun or moon
 	bool InMapMenu;   // If the world/local map is open (note that the renderer is still deferred here)
+	float3 pad0;
 };
 
 struct GrassLightingSettings

package/Shaders/DeferredCompositeCS.hlsl

@@ -1,8 +1,8 @@
 
 #include "Common/Color.hlsli"
-#include "Common/DeferredShared.hlsli"
 #include "Common/FrameBuffer.hlsli"
 #include "Common/GBuffer.hlsli"
+#include "Common/SharedData.hlsli"
 #include "Common/VR.hlsli"
 
 Texture2D<half3> SpecularTexture : register(t0);
@@ -25,15 +25,8 @@ SamplerState LinearSampler : register(s0);
 #endif
 
 #if defined(SKYLIGHTING)
-#	define SL_INCL_STRUCT
-#	define SL_INCL_METHODS
 #	include "Skylighting/Skylighting.hlsli"
 
-cbuffer SkylightingCB : register(b1)
-{
-	SkylightingSettings skylightingSettings;
-};
-
 Texture3D<sh2> SkylightingProbeArray : register(t9);
 #endif
 
@@ -89,7 +82,6 @@ Texture2D<half4> SpecularSSGITexture : register(t10);
 		half roughness = 1.0 - glossiness;
 		half level = roughness * 7.0;
 
-		half3 directionalAmbientColor = Color::GammaToLinear(mul(DirectionalAmbient, half4(R, 1.0))) / Color::LightPreMult;
 		half3 finalIrradiance = 0;
 
 #	if defined(INTERIOR)

package/Shaders/Lighting.hlsl

@@ -997,7 +997,6 @@ float GetSnowParameterY(float texProjTmp, float alpha)
 #	endif
 
 #	if defined(SKYLIGHTING)
-#		define SL_INCL_METHODS
 #		include "Skylighting/Skylighting.hlsli"
 #	endif
 

package/Shaders/RunGrass.hlsl

@@ -390,7 +390,6 @@ cbuffer PerMaterial : register(b1)
 #		endif
 
 #		if defined(SKYLIGHTING)
-#			define SL_INCL_METHODS
 #			include "Skylighting/Skylighting.hlsli"
 #		endif
 

package/Shaders/Water.hlsl

@@ -414,7 +414,6 @@ float calculateDepthMultfromUV(float2 a_uv, float a_depth, uint a_eyeIndex = 0)
 #		endif
 
 #		if defined(SKYLIGHTING)
-#			define SL_INCL_METHODS
 #			include "Skylighting/Skylighting.hlsli"
 #		endif
 

src/Deferred.cpp

@@ -112,10 +112,6 @@ void Deferred::SetupResources()
 		SetupRenderTarget(MASKS2, texDesc, srvDesc, rtvDesc, uavDesc, DXGI_FORMAT_R8G8B8A8_UNORM);
 	}
 
-	{
-		deferredCB = new ConstantBuffer(ConstantBufferDesc<DeferredCB>());
-	}
-
 	{
 		auto& device = State::GetSingleton()->device;
 
@@ -228,32 +224,6 @@ void Deferred::CopyShadowData()
 	}
 }
 
-void Deferred::UpdateConstantBuffer()
-{
-	DeferredCB data{};
-
-	auto state = State::GetSingleton();
-
-	data.BufferDim.x = state->screenSize.x;
-	data.BufferDim.y = state->screenSize.y;
-	data.BufferDim.z = 1.0f / data.BufferDim.x;
-	data.BufferDim.w = 1.0f / data.BufferDim.y;
-
-	data.CameraData = Util::GetCameraData();
-
-	const auto& shaderManager = RE::BSShaderManager::State::GetSingleton();
-	const RE::NiTransform& dalcTransform = shaderManager.directionalAmbientTransform;
-	Util::StoreTransform3x4NoScale(data.DirectionalAmbient, dalcTransform);
-
-	auto imageSpaceManager = RE::ImageSpaceManager::GetSingleton();
-
-	auto useTAA = !REL::Module::IsVR() ? imageSpaceManager->GetRuntimeData().BSImagespaceShaderISTemporalAA->taaEnabled : imageSpaceManager->GetVRRuntimeData().BSImagespaceShaderISTemporalAA->taaEnabled;
-	data.FrameCount = useTAA ? RE::BSGraphics::State::GetSingleton()->frameCount : 0;
-	data.FrameCountAlwaysActive = RE::BSGraphics::State::GetSingleton()->frameCount;
-
-	deferredCB->Update(data);
-}
-
 void Deferred::PrepassPasses()
 {
 	ZoneScoped;
@@ -360,13 +330,10 @@ void Deferred::DeferredPasses()
 	auto renderer = RE::BSGraphics::Renderer::GetSingleton();
 	auto& context = State::GetSingleton()->context;
 
-	UpdateConstantBuffer();
-
 	{
 		static REL::Relocation<ID3D11Buffer**> perFrame{ REL::RelocationID(524768, 411384) };
-		ID3D11Buffer* buffers[2] = { deferredCB->CB(), *perFrame.get() };
-
-		context->CSSetConstantBuffers(11, 2, buffers);
+		ID3D11Buffer* buffers[1] = { *perFrame.get() };
+		context->CSSetConstantBuffers(12, 1, buffers);
 	}
 
 	auto specular = renderer->GetRuntimeData().renderTargets[SPECULAR];
@@ -399,9 +366,6 @@ void Deferred::DeferredPasses()
 		{
 			TracyD3D11Zone(State::GetSingleton()->tracyCtx, "Ambient Composite");
 
-			ID3D11Buffer* buffer = skylighting->loaded ? skylighting->skylightingCB->CB() : nullptr;
-			context->CSSetConstantBuffers(1, 1, &buffer);
-
 			ID3D11ShaderResourceView* srvs[6]{
 				albedo.SRV,
 				normalRoughness.SRV,
@@ -430,9 +394,6 @@ void Deferred::DeferredPasses()
 			ID3D11UnorderedAccessView* uavs[2]{ nullptr, nullptr };
 			context->CSSetUnorderedAccessViews(0, ARRAYSIZE(uavs), uavs, nullptr);
 
-			ID3D11Buffer* buffer = nullptr;
-			context->CSSetConstantBuffers(0, 1, &buffer);
-
 			context->CSSetShader(nullptr, nullptr, 0);
 		}
 	}
@@ -451,9 +412,6 @@ void Deferred::DeferredPasses()
 	{
 		TracyD3D11Zone(State::GetSingleton()->tracyCtx, "Deferred Composite");
 
-		ID3D11Buffer* buffer = skylighting->loaded ? skylighting->skylightingCB->CB() : nullptr;
-		context->CSSetConstantBuffers(1, 1, &buffer);
-
 		bool doSSGISpecular = ssgi->loaded && ssgi->settings.Enabled && ssgi->settings.EnableGI && ssgi->settings.EnableSpecularGI;
 
 		ID3D11ShaderResourceView* srvs[11]{
@@ -482,9 +440,6 @@ void Deferred::DeferredPasses()
 		context->CSSetShader(shader, nullptr, 0);
 
 		context->Dispatch(dispatchCount.x, dispatchCount.y, 1);
-
-		buffer = nullptr;
-		context->CSSetConstantBuffers(0, 1, &buffer);
 	}
 
 	// Clear
@@ -495,8 +450,8 @@ void Deferred::DeferredPasses()
 		ID3D11UnorderedAccessView* uavs[3]{ nullptr, nullptr, nullptr };
 		context->CSSetUnorderedAccessViews(0, ARRAYSIZE(uavs), uavs, nullptr);
 
-		ID3D11Buffer* buffer = nullptr;
-		context->CSSetConstantBuffers(0, 1, &buffer);
+		ID3D11Buffer* buffers[1] = { nullptr };
+		context->CSSetConstantBuffers(12, 1, buffers);
 
 		context->CSSetShader(nullptr, nullptr, 0);
 	}