Skip to content

fix(water): fix water blending by setting buffers to RGBA16 #2386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doodlum merged 2 commits into from
May 20, 2026
+12 −19
Merged

fix(water): fix water blending by setting buffers to RGBA16 #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d65780
fix(water): fix water blending by setting to RGBA16
jiayev May 20, 2026
e9c026e
Merge branch 'dev' into fix-water-blend-hdr
jiayev May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions package/Shaders/ISWaterBlend.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#include "Common/DummyVSTexCoord.hlsl"
#include "Common/FrameBuffer.hlsli"
#include "Common/Math.hlsli"
#include "Common/VR.hlsli"

typedef VS_OUTPUT PS_INPUT;

struct PS_OUTPUT
{
float3 Color: SV_Target0;
float3 Color1: SV_Target1;
float4 Color1: SV_Target1;
};

#if defined(PSHADER)
Expand All @@ -19,7 +18,7 @@ SamplerState depthBufferSampler : register(s3);
SamplerState waterMaskSampler : register(s4);

Texture2D<float4> sourceTex : register(t0);
Texture2D<float3> waterHistoryTex : register(t1);
Texture2D<float4> waterHistoryTex : register(t1);
Texture2D<float4> motionBufferTex : register(t2);
Texture2D<float4> depthBufferTex : register(t3);
Texture2D<float4> waterMaskTex : register(t4);
Expand All @@ -32,16 +31,11 @@ cbuffer PerGeometry : register(b2)
namespace WaterBlend
{
static const float WaterMaskThreshold = 1e-4f;
static const float FullHistoryCoverageThreshold = 1e-3f;
static const float FullWaterCoverageThreshold = 1e-3f;

float SaturateRange(float value, float minValue, float maxValue)
float GetWaterCoverage(float waterMask)
{
return saturate((value - minValue) / max(maxValue - minValue, EPSILON_DIVISION));
}

float GetHistoryCoverage(float historyMask)
{
return SaturateRange(historyMask, WaterMaskThreshold, FullHistoryCoverageThreshold);
return saturate((waterMask - WaterMaskThreshold) / (FullWaterCoverageThreshold - WaterMaskThreshold));
}
}

Expand All @@ -60,16 +54,15 @@ PS_OUTPUT main(PS_INPUT input)
float2 motionScreenPosition = Stereo::ConvertToStereoUV(Stereo::ConvertFromStereoUV(input.TexCoord, eyeIndex) + motion, eyeIndex);
float2 motionAdjustedScreenPosition =
FrameBuffer::GetPreviousDynamicResolutionAdjustedScreenPosition(motionScreenPosition);
float4 waterHistory =
waterHistoryTex.Sample(waterHistorySampler, motionAdjustedScreenPosition).xyzw;

float historyMask = waterMaskTex.Sample(waterMaskSampler, motionAdjustedScreenPosition).z;
float historyCoverage = WaterBlend::GetHistoryCoverage(historyMask);
float3 finalColor = sourceColor;
if (
# ifndef VR
motionScreenPosition.x >= 0 && motionScreenPosition.y >= 0 && motionScreenPosition.x <= 1 &&
# endif
motionScreenPosition.y <= 1 && historyCoverage > 0.0) {
float3 waterHistory = waterHistoryTex.Sample(waterHistorySampler, motionAdjustedScreenPosition).xyz;
motionScreenPosition.y <= 1 && waterHistory.w > 0.0) {
float historyFactor = 0.95;
if (NearFar_Menu_DistanceFactor.z == 0) {
float depth = depthBufferTex.Sample(depthBufferSampler, adjustedScreenPosition).x;
Expand All @@ -82,11 +75,11 @@ PS_OUTPUT main(PS_INPUT input)
0.1, 0.95);
historyFactor = NearFar_Menu_DistanceFactor.w * (distanceFactor * (waterMask * -0.85 + 0.95));
}
historyFactor *= historyCoverage;
historyFactor *= waterHistory.w;
finalColor = lerp(sourceColor, waterHistory.xyz, historyFactor);
}

psout.Color1 = finalColor;
psout.Color1 = float4(finalColor, WaterBlend::GetWaterCoverage(waterMask));
psout.Color = finalColor;

return psout;
Expand Down
4 changes: 2 additions & 2 deletions src/Deferred.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ void Deferred::SetupResources()
SetupRenderTarget(MASKS, texDesc, srvDesc, rtvDesc, uavDesc, DXGI_FORMAT_R11G11B10_FLOAT, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE);

// TAA Water Buffers
SetupRenderTarget(RE::RENDER_TARGETS::kWATER_1, texDesc, srvDesc, rtvDesc, uavDesc, DXGI_FORMAT_R11G11B10_FLOAT, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE);
SetupRenderTarget(RE::RENDER_TARGETS::kWATER_2, texDesc, srvDesc, rtvDesc, uavDesc, DXGI_FORMAT_R11G11B10_FLOAT, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE);
SetupRenderTarget(RE::RENDER_TARGETS::kWATER_1, texDesc, srvDesc, rtvDesc, uavDesc, DXGI_FORMAT_R16G16B16A16_FLOAT, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE);
SetupRenderTarget(RE::RENDER_TARGETS::kWATER_2, texDesc, srvDesc, rtvDesc, uavDesc, DXGI_FORMAT_R16G16B16A16_FLOAT, D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE);
}

{
Expand Down
Loading