Merge pull request #298 from alandtse/deferred-shadows

doodlum · Apr 30, 2024 · ac95b04 · ac95b04
2 parents a879ab5 + 837e786
commit ac95b04
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/extern/CommonLibSSE-NG b/extern/CommonLibSSE-NG
diff --git a/features/Screen-Space Shadows/Shaders/ScreenSpaceShadows/NormalMappingShadowsCS.hlsl b/features/Screen-Space Shadows/Shaders/ScreenSpaceShadows/NormalMappingShadowsCS.hlsl
@@ -63,14 +63,14 @@ half2 ViewToUV(half3 position, bool is_position, uint a_eyeIndex)
 
 	uint eyeIndex = GetEyeIndexFromTexCoord(uv);
 
-	half3 viewPosition = DepthToView(uv, rawDepth, eyeIndex);
+	half3 viewPosition = DepthToView(ConvertFromStereoUV(uv, eyeIndex), rawDepth, eyeIndex);  // viewPosition is in VR nonstereospace
 	viewPosition.z = depth;
 
 	half3 endPosVS = viewPosition + DirLightDirectionVS[eyeIndex].xyz * 5;
 	half2 endPosUV = ViewToUV(endPosVS, false, eyeIndex);
 
-	half2 startPosPixel = clamp(uv * BufferDim, 0, BufferDim);
-	half2 endPosPixel = clamp(endPosUV * BufferDim, 0, BufferDim);
+	half2 startPosPixel = clamp(uv * BufferDim, 0, BufferDim);                                   // uv is in VR stereo space
+	half2 endPosPixel = clamp(ConvertToStereoUV(endPosUV, eyeIndex) * BufferDim, 0, BufferDim);  // convert back to stereospace since derived from viewPosition
 
 	half NdotL = dot(normalVS, DirLightDirectionVS[eyeIndex].xyz);
 
@@ -89,7 +89,7 @@ half2 ViewToUV(half3 position, bool is_position, uint a_eyeIndex)
 		half slope = -NdotL;
 
 		for (int i = 0; i < 5; i++) {
-			uint2 tmpCoords = lerp(startPosPixel, endPosPixel, pos);
+			uint2 tmpCoords = lerp(startPosPixel, endPosPixel, pos);  // coords are in stereo space to access Textures
 			half3 tmpNormal = DecodeNormal(NormalRoughnessTexture[tmpCoords].xy);
 			half tmpDepth = GetScreenDepth(DepthTexture[tmpCoords]);
 			half tmpNdotL = dot(tmpNormal, DirLightDirectionVS[eyeIndex].xyz);

diff --git a/package/Shaders/Common/VR.hlsli b/package/Shaders/Common/VR.hlsli
@@ -124,7 +124,7 @@ uint GetEyeIndexVS(uint instanceID = 0)
 
 /**
 Gets VR Output
-@param texCoord Texcoord on the screen [0,1]
+@param clipPos clipPosition. Typically the VSHADER position at SV_POSITION0
 @param a_eyeIndex The eyeIndex; 0 is left, 1 is right
 @returns VR_OUTPUT with VR values
 */
+2 −0		cmake/sourcelist.cmake
+3 −3		include/RE/B/BGSDefaultObjectManager.h
+1 −1		include/RE/B/BSLight.h
+19 −0		include/RE/B/BSShaderRenderTargets.h
+2 −2		include/RE/B/BSSoundHandle.h
+1 −1		include/RE/C/CombatController.h
+3 −3		include/RE/C/CombatGroup.h
+14 −13		include/RE/C/CombatManager.h
+1 −0		include/RE/C/ConstructibleObjectMenu.h
+1 −0		include/RE/C/CraftingMenu.h
+8 −0		include/RE/C/CraftingSubMenu.h
+18 −0		include/RE/I/InterfaceLightSchemes.h
+30 −27		include/RE/I/Inventory3DManager.h
+1 −0		include/RE/M/MagicMenu.h
+58 −0		include/RE/N/NiBillboardNode.h
+2 −0		include/RE/N/NiCamera.h
+1 −0		include/RE/N/NiPoint3.h
+29 −5		include/RE/N/NiPointLight.h
+0 −1		include/RE/N/NiStream.h
+20 −13		include/RE/S/ShadowSceneNode.h
+10 −7		include/RE/S/Sky.h
+1 −0		include/RE/S/SmithingMenu.h
+2 −0		include/RE/Skyrim.h
+9 −9		include/RE/T/TESObjectCELL.h
+9 −0		include/RE/T/TESObjectLIGH.h
+1 −14		include/RE/U/UI3DSceneManager.h
+532 −531		include/REL/ID.h
+76 −74		include/REL/Module.h
+13 −13		include/REL/Offset.h
+191 −176		include/REL/Version.h
+3 −1		src/RE/A/Actor.cpp
+1 −1		src/RE/B/BSSoundHandle.cpp
+8 −1		src/RE/I/Inventory3DManager.cpp
+6 −1		src/RE/N/NiCamera.cpp
+5 −0		src/RE/N/NiPoint3.cpp
+67 −10		src/RE/S/Sky.cpp
+26 −23		src/REL/ID.cpp
+3 −4		src/REL/Module.cpp