chore: messy update dx12 swapchain branch

.gitignore

@@ -1,6 +1,7 @@
 build/
 bin/
 dist/
+.idea/
 .vs*/
 CMakeUserPresets.json
 shadertoolsconfig.json

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21)
 
 project(
 	CommunityShaders
-	VERSION 1.1.15
+	VERSION 1.2.0
 	LANGUAGES CXX
 )
 

README.md

@@ -86,6 +86,12 @@ docker run -it --rm -v .:C:/skyrim-community-shaders skyrim-community-shaders:la
 4. Retrieve the generated build files from the `build/aio` folder.
 5. In subsequent builds only run the build step (3.)
 
+#### Troubleshooting Build with Docker
+If you run into `Access violation` build errors during step 3, you can try adding [`--isolation=process`](https://learn.microsoft.com/en-us/virtualization/windowscontainers/manage-containers/hyperv-container):
+```pwsh
+docker run -it --rm --isolation=process -v .:C:/skyrim-community-shaders skyrim-community-shaders:latest
+```
+
 ## License
 
 ### Default

cmake/XSEPlugin.cmake

@@ -83,7 +83,6 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio")
 		/Zc:trigraphs
 		/Zc:wchar_t
 		/wd4200 # nonstandard extension used : zero-sized array in struct/union
-		# /arch:AVX
 	)
 
 	target_compile_options(${PROJECT_NAME} PUBLIC "$<$<CONFIG:DEBUG>:${SC_DEBUG_OPTS}>")

features/Cloud Shadows/Shaders/CloudShadows/CloudShadows.hlsli

@@ -21,6 +21,6 @@ namespace CloudShadows
 	{
 		float3 cloudSampleDir = GetCloudShadowSampleDir(worldPosition, SharedData::DirLightDirection.xyz).xyz;
 		float cloudCubeSample = CloudShadowsTexture.SampleLevel(textureSampler, cloudSampleDir, 0).x;
-		return 1.0 - saturate(cloudCubeSample);
+		return lerp(1.0, 1.0 - cloudCubeSample, SharedData::cloudShadowsSettings.Opacity);
 	}
 }

features/Cloud Shadows/Shaders/Features/CloudShadows.ini

@@ -1,2 +1,2 @@
 [Info]
-Version = 1-1-1
+Version = 1-2-0

features/Dynamic Cubemaps/Shaders/DynamicCubemaps/DynamicCubemaps.hlsli

@@ -1,3 +1,8 @@
+
+#if defined(SKYLIGHTING)
+#	include "Skylighting/Skylighting.hlsli"
+#endif
+
 namespace DynamicCubemaps
 {
 	TextureCube<float4> EnvReflectionsTexture : register(t30);
@@ -16,24 +21,65 @@ namespace DynamicCubemaps
 
 #if !defined(WATER)
 
-	float3 GetDynamicCubemapSpecularIrradiance(float2 uv, float3 N, float3 VN, float3 V, float roughness, float distance)
+#	if defined(SKYLIGHTING)
+	float3 GetDynamicCubemapSpecularIrradiance(float2 uv, float3 N, float3 VN, float3 V, float roughness, sh2 skylighting)
+#	else
+	float3 GetDynamicCubemapSpecularIrradiance(float2 uv, float3 N, float3 VN, float3 V, float roughness)
+#	endif
 	{
 		float3 R = reflect(-V, N);
+		float NoV = saturate(dot(N, V));
+
 		float level = roughness * 7.0;
 
 		// Horizon specular occlusion
 		// https://marmosetco.tumblr.com/post/81245981087
 		float horizon = min(1.0 + dot(R, VN), 1.0);
 		horizon *= horizon * horizon;
 
-		float3 specularIrradiance = EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).xyz;
-		specularIrradiance = Color::GammaToLinear(specularIrradiance);
-		specularIrradiance *= horizon;
+#	if defined(DEFERRED)
+		return horizon;
+#	else
+
+		float3 finalIrradiance = 0;
+
+#		if defined(SKYLIGHTING)
+		if (SharedData::InInterior) {
+			float3 specularIrradiance = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level));
+
+			return finalIrradiance;
+		}
+
+		sh2 specularLobe = SphericalHarmonics::FauxSpecularLobe(N, -V, roughness);
+
+		float skylightingSpecular = SphericalHarmonics::FuncProductIntegral(skylighting, specularLobe);
+		skylightingSpecular = Skylighting::mixSpecular(SharedData::skylightingSettings, skylightingSpecular);
+
+		float3 specularIrradiance = 1;
+
+		if (skylightingSpecular < 1.0)
+			specularIrradiance = Color::GammaToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level));
+
+		float3 specularIrradianceReflections = 1.0;
 
-		return specularIrradiance;
+		if (skylightingSpecular > 0.0)
+			specularIrradianceReflections = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level));
+
+		finalIrradiance = lerp(specularIrradiance, specularIrradianceReflections, skylightingSpecular);
+#		else
+		float3 specularIrradiance = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level));
+
+		finalIrradiance += specularIrradiance;
+#		endif
+		return finalIrradiance;
+#	endif
 	}
 
-	float3 GetDynamicCubemap(float2 uv, float3 N, float3 VN, float3 V, float roughness, float3 F0, float3 diffuseColor, float distance)
+#	if defined(SKYLIGHTING)
+	float3 GetDynamicCubemap(float3 N, float3 VN, float3 V, float roughness, float3 F0, sh2 skylighting)
+#	else
+	float3 GetDynamicCubemap(float3 N, float3 VN, float3 V, float roughness, float3 F0)
+#	endif
 	{
 		float3 R = reflect(-V, N);
 		float NoV = saturate(dot(N, V));
@@ -48,12 +94,42 @@ namespace DynamicCubemaps
 		horizon *= horizon * horizon;
 
 #	if defined(DEFERRED)
-		return horizon * (1 + F0 * (1 / (specularBRDF.x + specularBRDF.y) - 1));
+		return horizon * (F0 * specularBRDF.x + specularBRDF.y);
 #	else
-		float3 specularIrradiance = EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level).xyz;
-		specularIrradiance = Color::GammaToLinear(specularIrradiance);
 
-		return specularIrradiance * (1 + F0 * (1 / (specularBRDF.x + specularBRDF.y) - 1));
+		float3 finalIrradiance = 0;
+
+#		if defined(SKYLIGHTING)
+		if (SharedData::InInterior) {
+			float3 specularIrradiance = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level));
+
+			finalIrradiance += specularIrradiance;
+
+			return horizon * (F0 * specularBRDF.x + specularBRDF.y) * finalIrradiance;
+		}
+
+		sh2 specularLobe = SphericalHarmonics::FauxSpecularLobe(N, -V, roughness);
+
+		float skylightingSpecular = SphericalHarmonics::FuncProductIntegral(skylighting, specularLobe);
+		skylightingSpecular = Skylighting::mixSpecular(SharedData::skylightingSettings, skylightingSpecular);
+
+		float3 specularIrradiance = 1;
+
+		if (skylightingSpecular < 1.0)
+			specularIrradiance = Color::GammaToLinear(EnvTexture.SampleLevel(SampColorSampler, R, level));
+
+		float3 specularIrradianceReflections = 1.0;
+
+		if (skylightingSpecular > 0.0)
+			specularIrradianceReflections = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level));
+
+		finalIrradiance = lerp(specularIrradiance, specularIrradianceReflections, skylightingSpecular);
+#		else
+		float3 specularIrradiance = Color::GammaToLinear(EnvReflectionsTexture.SampleLevel(SampColorSampler, R, level));
+
+		finalIrradiance += specularIrradiance;
+#		endif
+		return horizon * (F0 * specularBRDF.x + specularBRDF.y) * finalIrradiance;
 #	endif
 	}
 #endif  // !WATER

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

@@ -120,7 +120,16 @@ float smoothbumpstep(float edge0, float edge1, float x)
 
 	float4 color = DynamicCubemapRaw[ThreadID];
 
-	float distanceFactor = sqrt(smoothbumpstep(0.0, 2.0, length(position.xyz)));
+	float distance = length(position.xyz);
+	float distanceFactor = smoothbumpstep(0.0, 2.0, distance);
+
+	if (distance < 1.0)
+		distanceFactor = sqrt(distanceFactor);
+
+#if defined(FAKEREFLECTIONS)
+	distanceFactor = max(distanceFactor, smoothstep(0.0, 2.0, distance));
+#endif
+
 	color *= distanceFactor;
 
 	DynamicCubemap[ThreadID] = max(0, color);

features/Dynamic Cubemaps/Shaders/Features/DynamicCubemaps.ini

@@ -1,2 +1,2 @@
 [Info]
-Version = 2-0-0
+Version = 2-1-0