RWMC #218
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,22 @@ | ||
| #ifndef _NBL_HLSL_PATHTRACER_RENDER_COMMON_INCLUDED_ | ||
| #define _NBL_HLSL_PATHTRACER_RENDER_COMMON_INCLUDED_ | ||
| #include "nbl/builtin/hlsl/cpp_compat.hlsl" | ||
|
|
||
| #ifndef __HLSL_VERSION | ||
| #include "matrix4SIMD.h" | ||
| #endif | ||
|
|
||
| struct RenderPushConstants | ||
| { | ||
| #ifdef __HLSL_VERSION | ||
| float32_t4x4 invMVP; | ||
| #else | ||
| nbl::core::matrix4SIMD invMVP; | ||
| #endif | ||
|
Comment on lines
-4
to
+15
There was a problem hiding this comment. no we use |
||
| int sampleCount; | ||
| int depth; | ||
| }; | ||
|
|
||
| NBL_CONSTEXPR nbl::hlsl::float32_t3 LightEminence = nbl::hlsl::float32_t3(30.0f, 25.0f, 15.0f); | ||
|
|
||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #ifndef _NBL_HLSL_PATHTRACER_RENDER_RWMC_COMMON_INCLUDED_ | ||
| #define _NBL_HLSL_PATHTRACER_RENDER_RWMC_COMMON_INCLUDED_ | ||
| #include "nbl/builtin/hlsl/cpp_compat.hlsl" | ||
|
|
||
| #ifndef __HLSL_VERSION | ||
| #include "matrix4SIMD.h" | ||
| #endif | ||
|
|
||
| struct RenderRWMCPushConstants | ||
| { | ||
| #ifdef __HLSL_VERSION | ||
| float32_t4x4 invMVP; | ||
| #else | ||
| nbl::core::matrix4SIMD invMVP; | ||
| #endif | ||
| int sampleCount; | ||
| int depth; | ||
|
Comment on lines
+9
to
+17
There was a problem hiding this comment. make one push cosntant struct in terms of the other, preferably through composition, so struct RenderRWMCPushConstants
{
RenderPushConstants base;
rwmc::SplattingParameters rwmc;
}; |
||
| float start; | ||
| float base; | ||
| float kappa; | ||
|
Comment on lines
+18
to
+20
There was a problem hiding this comment. dont use the same push constants for resolve and rendering & splatting I really want you to pack up |
||
| }; | ||
|
|
||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| #include <nbl/builtin/hlsl/rwmc/rwmc.hlsl> | ||
| #include "resolve_common.hlsl" | ||
| #include "rwmc_global_settings_common.hlsl" | ||
| #ifdef PERSISTENT_WORKGROUPS | ||
| #include "nbl/builtin/hlsl/math/morton.hlsl" | ||
| #endif | ||
|
|
||
| [[vk::push_constant]] ResolvePushConstants pc; | ||
| [[vk::image_format("rgba16f")]] [[vk::binding(0, 0)]] RWTexture2D<float32_t4> outImage; | ||
| [[vk::image_format("rgba16f")]] [[vk::binding(0, 1)]] RWTexture2DArray<float32_t4> cascade; | ||
|
|
||
| using namespace nbl; | ||
| using namespace hlsl; | ||
|
|
||
| NBL_CONSTEXPR uint32_t WorkgroupSize = 512; | ||
| NBL_CONSTEXPR uint32_t MAX_DEPTH_LOG2 = 4; | ||
| NBL_CONSTEXPR uint32_t MAX_SAMPLES_LOG2 = 10; | ||
|
Comment on lines
+16
to
+17
There was a problem hiding this comment. you dont need those here I think |
||
|
|
||
| int32_t2 getCoordinates() | ||
| { | ||
| uint32_t width, height; | ||
| outImage.GetDimensions(width, height); | ||
| return int32_t2(glsl::gl_GlobalInvocationID().x % width, glsl::gl_GlobalInvocationID().x / width); | ||
| } | ||
|
Comment on lines
+19
to
+24
There was a problem hiding this comment. use a 2D dispatch |
||
|
|
||
| [numthreads(WorkgroupSize, 1, 1)] | ||
| void main(uint32_t3 threadID : SV_DispatchThreadID) | ||
| { | ||
| #ifdef PERSISTENT_WORKGROUPS | ||
| uint32_t virtualThreadIndex; | ||
| [loop] | ||
| for (uint32_t virtualThreadBase = glsl::gl_WorkGroupID().x * WorkgroupSize; virtualThreadBase < 1920 * 1080; virtualThreadBase += glsl::gl_NumWorkGroups().x * WorkgroupSize) | ||
|
There was a problem hiding this comment. don't hardcode rendertarget resolution There was a problem hiding this comment. you can query it from the cascade image HLSL has intrinsics for that, you can add SPIR-V instrinscis for GLSL functions |
||
| { | ||
| virtualThreadIndex = virtualThreadBase + glsl::gl_LocalInvocationIndex().x; | ||
| const int32_t2 coords = (int32_t2)math::Morton<uint32_t>::decode2d(virtualThreadIndex); | ||
| #else | ||
| const int32_t2 coords = getCoordinates(); | ||
| #endif | ||
|
|
||
| rwmc::ReweightingParameters reweightingParameters = rwmc::computeReweightingParameters(pc.base, pc.sampleCount, pc.minReliableLuma, pc.kappa, CascadeSize); | ||
|
Member
There was a problem hiding this comment. this should be done on CPU and the |
||
| float32_t3 color = rwmc::reweight(reweightingParameters, cascade, coords); | ||
|
|
||
| outImage[coords] = float32_t4(color, 1.0f); | ||
|
|
||
| #ifdef PERSISTENT_WORKGROUPS | ||
| } | ||
| #endif | ||
|
Comment on lines
+29
to
+47
There was a problem hiding this comment. Resolve doesn't need to use persistent WG, you can use a Regular 2D dispatch |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| #ifndef _NBL_HLSL_PATHTRACER_RESOLVE_COMMON_INCLUDED_ | ||
| #define _NBL_HLSL_PATHTRACER_RESOLVE_COMMON_INCLUDED_ | ||
| #include "nbl/builtin/hlsl/cpp_compat.hlsl" | ||
|
|
||
| struct ResolvePushConstants | ||
| { | ||
| uint32_t sampleCount; | ||
| float base; | ||
| float minReliableLuma; | ||
| float kappa; | ||
| }; | ||
|
|
||
| #endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #ifndef _NBL_HLSL_PATHTRACER_RWMC_GLOBAL_SETTINGS_COMMON_INCLUDED_ | ||
| #define _NBL_HLSL_PATHTRACER_RWMC_GLOBAL_SETTINGS_COMMON_INCLUDED_ | ||
| #include "nbl/builtin/hlsl/cpp_compat.hlsl" | ||
|
|
||
| NBL_CONSTEXPR uint32_t CascadeSize = 6u; | ||
|
|
||
| #endif |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
one suggestion to refactor, take
sampleIndex(theiin the loop) and do the loop outside the path tracer (initialize the accumulator outside as well)Also I know its not your code, but better rename
depthtomaxDepth