[Port] [6000.3] [HDRP] Fix water height sampling when distant wind speed is high

svc-reach-platform-support · Evergreen · commit c94a6035df34 · 2026-01-26T18:27:15.000Z
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.SimulationCPU.Search.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/HDRenderPipeline.WaterSystem.SimulationCPU.Search.cs
@@ -343,7 +343,7 @@ static WaterSimulationTapData EvaluateDisplacementData(WaterSimSearchData wsd, f
             EvaluateSimulationDisplacement(wsd, currentLocation, includeSimulation, out data.horizontalDisplacement, out data.direction, out data.verticalDisplacements);
 
             // Evaluate the distance to the reference point
-            data.offset = (currentLocation.xz + data.horizontalDisplacement) - referencePosition.xz;
+            data.offset = currentLocation.xz - referencePosition.xz;
             data.distance = length(data.offset);
 
             return data;
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/SampleWaterSurface.hlsl b/Packages/com.unity.render-pipelines.high-definition/Runtime/Water/Shaders/SampleWaterSurface.hlsl
@@ -579,7 +579,7 @@ TapData EvaluateDisplacementData(float3 currentLocation, float3 referencePositio
     EvaluateSimulationDisplacement(currentLocation, data.horizontalDisplacement, data.verticalDisplacements);
 
     // Evaluate the distance to the reference point
-    data.offset = (currentLocation.xz + data.horizontalDisplacement) - referencePosition.xz;
+    data.offset = currentLocation.xz - referencePosition.xz;
     data.distance = length(data.offset);
 
     return data;
