Skip to content
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

FilterBlurMask pass: fix unpacking/packing of blur mask from/to R8_SNORM #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FilterBlurMask pass: fix unpacking/packing of blur mask from/to R8_SNORM #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/core/src/render_techniques/gi10/gi10.comp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3656,7 +3656,7 @@ void ReprojectGI(in uint2 did : SV_DispatchThreadID)
lighting *= (max_sample_count / lighting.w);
}

g_GIDenoiser_BlurMask[did] = blur_mask / 127.0f;
g_GIDenoiser_BlurMask[did] = blur_mask * kGIDenoiser_BlurMaskPack;
g_GIDenoiser_ColorBuffer[did] = lighting;
g_GIDenoiser_ColorDeltaBuffer[did] = color_delta;
}
Expand All @@ -3678,10 +3678,10 @@ void FilterBlurMask(in uint2 did : SV_DispatchThreadID, in uint2 lid : SV_GroupT
int2 coord3 = anchor + int2((local_id + kGIDenoiser_BlurTileDim * kGIDenoiser_BlurTileDim / 2) % kGIDenoiser_BlurTileDim, (local_id + kGIDenoiser_BlurTileDim * kGIDenoiser_BlurTileDim / 2) / kGIDenoiser_BlurTileDim);
int2 coord4 = anchor + int2((local_id + kGIDenoiser_BlurTileDim * kGIDenoiser_BlurTileDim * 3 / 4) % kGIDenoiser_BlurTileDim, (local_id + kGIDenoiser_BlurTileDim * kGIDenoiser_BlurTileDim * 3 / 4) / kGIDenoiser_BlurTileDim);

float blur_mask_0 = g_GIDenoiser_BlurMask[clamp(coord1, 0, int2(g_BufferDimensions) - 1)].x;
float blur_mask_1 = g_GIDenoiser_BlurMask[clamp(coord2, 0, int2(g_BufferDimensions) - 1)].x;
float blur_mask_2 = g_GIDenoiser_BlurMask[clamp(coord3, 0, int2(g_BufferDimensions) - 1)].x;
float blur_mask_3 = g_GIDenoiser_BlurMask[clamp(coord4, 0, int2(g_BufferDimensions) - 1)].x;
float blur_mask_0 = g_GIDenoiser_BlurMask[clamp(coord1, 0, int2(g_BufferDimensions) - 1)].x * kGIDenoiser_BlurMaskUnpack;
float blur_mask_1 = g_GIDenoiser_BlurMask[clamp(coord2, 0, int2(g_BufferDimensions) - 1)].x * kGIDenoiser_BlurMaskUnpack;
float blur_mask_2 = g_GIDenoiser_BlurMask[clamp(coord3, 0, int2(g_BufferDimensions) - 1)].x * kGIDenoiser_BlurMaskUnpack;
float blur_mask_3 = g_GIDenoiser_BlurMask[clamp(coord4, 0, int2(g_BufferDimensions) - 1)].x * kGIDenoiser_BlurMaskUnpack;

lds_GIDenoiser_BlurMask[local_id] = blur_mask_0;
lds_GIDenoiser_BlurMask[local_id + kGIDenoiser_BlurTileDim * kGIDenoiser_BlurTileDim / 4] = blur_mask_1;
Expand Down Expand Up @@ -3725,7 +3725,7 @@ void FilterBlurMask(in uint2 did : SV_DispatchThreadID, in uint2 lid : SV_GroupT
InterlockedAdd(g_GIDenoiser_BlurSampleCountBuffer[0], lds_GIDenoiser_BlurSampleCount);
}

g_GIDenoiser_BlurredBlurMask[did] = blur_mask;
g_GIDenoiser_BlurredBlurMask[did] = blur_mask * kGIDenoiser_BlurMaskPack;
}

[numthreads(8, 8, 1)]
Expand Down
4 changes: 4 additions & 0 deletions src/core/src/render_techniques/gi10/gi_denoiser.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ THE SOFTWARE.
#ifndef GI_DENOISER_HLSL
#define GI_DENOISER_HLSL

// Blur mask texture format is R8_SNORM, with -1 encoding sky pixels and [0, 127] (actually [0, 8]) encoding the blur radius
#define kGIDenoiser_BlurMaskUnpack 127.f
#define kGIDenoiser_BlurMaskPack (1.f / kGIDenoiser_BlurMaskUnpack)

#define kGIDenoiser_BlurRadius 4
#define kGIDenoiser_BlurGroupSize 8
#define kGIDenoiser_BlurTileDim (2 * kGIDenoiser_BlurRadius + kGIDenoiser_BlurGroupSize)
Expand Down