Hlsl path tracer #224
Open
Hlsl path tracer #224
+4,847
−0
Conversation
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
Comment on lines
243
to
245
| const float32_t2 unpacked = hlsl::unpackHalf2x16(pc.packedSplattingParams); | ||
| rwmc::SplattingParameters splattingParameters = rwmc::SplattingParameters::create(unpacked[0], unpacked[1]); | ||
| accumulator_type accumulator = accumulator_type::create(splattingParameters); |
Member
Author
There was a problem hiding this comment.
add a get and set method to RenderRWMCPushConstants
| float32_t3 color = resolve(accessor, int16_t2(coords.x, coords.y)); | ||
|
|
||
| //float32_t3 color = rwmc::reweight<rwmc::ResolveAccessorAdaptor<float> >(pc.resolveParameters, cascade, coords); | ||
| //float32_t3 color = rwmc::reweight<ResolveAccessorAdaptor<float> >(pc.resolveParameters, cascade, coords); |
Member
Author
There was a problem hiding this comment.
whats this commented out code, if not used then remove it
31_HLSLPathTracer/main.cpp
Outdated
Comment on lines
1574
to
1575
| float32_t2 packParams = float32_t2(rwmcBase, rwmcStart); | ||
| rwmcPushConstants.packedSplattingParams = hlsl::packHalf2x16(packParams); |
Member
Author
There was a problem hiding this comment.
we need a setter method for the packed params
Comment on lines
1
to
27
| #ifndef _NBL_HLSL_PATHTRACING_INCLUDED_ | ||
| #define _NBL_HLSL_PATHTRACING_INCLUDED_ | ||
|
|
||
| #include <nbl/builtin/hlsl/colorspace/EOTF.hlsl> | ||
| #include <nbl/builtin/hlsl/colorspace/encodeCIEXYZ.hlsl> | ||
| #include <nbl/builtin/hlsl/math/functions.hlsl> | ||
| #include <nbl/builtin/hlsl/sampling/basic.hlsl> | ||
| #include <nbl/builtin/hlsl/bxdf/bxdf_traits.hlsl> | ||
| #include <nbl/builtin/hlsl/sampling/quantized_sequence.hlsl> | ||
| #include <nbl/builtin/hlsl/vector_utils/vector_traits.hlsl> | ||
| #include "concepts.hlsl" | ||
|
|
||
| namespace nbl | ||
| { | ||
| namespace hlsl | ||
| { | ||
| namespace path_tracing | ||
| { | ||
|
|
||
| template<class RandGen, class RayGen, class Intersector, class MaterialSystem, /* class PathGuider, */ class NextEventEstimator, class Accumulator, class Scene | ||
| NBL_PRIMARY_REQUIRES(concepts::RandGenerator<RandGen> && concepts::RayGenerator<RayGen> && | ||
| concepts::Intersector<Intersector> && concepts::MaterialSystem<MaterialSystem> && | ||
| concepts::NextEventEstimator<NextEventEstimator> && concepts::Accumulator<Accumulator> && | ||
| concepts::Scene<Scene>) | ||
| struct Unidirectional | ||
| { | ||
| using this_t = Unidirectional<RandGen, RayGen, Intersector, MaterialSystem, NextEventEstimator, Accumulator, Scene>; |
Member
Author
There was a problem hiding this comment.
all this needs to go to Nabla repo
Comment on lines
7
to
47
| template<typename RNG> | ||
| struct Uniform1D | ||
| { | ||
| using rng_type = RNG; | ||
| using return_type = uint32_t; | ||
|
|
||
| static Uniform1D<RNG> construct(uint32_t2 seed) | ||
| { | ||
| Uniform1D<RNG> retval; | ||
| retval.rng = rng_type::construct(seed); | ||
| return retval; | ||
| } | ||
|
|
||
| return_type operator()() | ||
| { | ||
| return rng(); | ||
| } | ||
|
|
||
| rng_type rng; | ||
| }; | ||
|
|
||
| template<typename RNG> | ||
| struct Uniform3D | ||
| { | ||
| using rng_type = RNG; | ||
| using return_type = uint32_t3; | ||
|
|
||
| static Uniform3D<RNG> construct(uint32_t2 seed) | ||
| { | ||
| Uniform3D<RNG> retval; | ||
| retval.rng = rng_type::construct(seed); | ||
| return retval; | ||
| } | ||
|
|
||
| return_type operator()() | ||
| { | ||
| return return_type(rng(), rng(), rng()); | ||
| } | ||
|
|
||
| rng_type rng; | ||
| }; |
Member
Author
There was a problem hiding this comment.
these need also static return_type __call(NBL_REF_ARG(rng_type) rng)
AND to be in Nabla repo
Contributor
There was a problem hiding this comment.
We have this sort of thing in DimAdaptorRecursive and it's been changed to this in pr 980
https://github.com/Devsh-Graphics-Programming/Nabla/blob/minor_adjustments_to_bxdf_and_path_tracing_stuff/include/nbl/builtin/hlsl/random/dim_adaptor_recursive.hlsl
So change once that's been merged? Also randgen concept will use __call instead then?
Comment on lines
23
to
31
| static this_t create(NBL_CONST_REF_ARG(vector2_type) pixOffsetParam, NBL_CONST_REF_ARG(vector3_type) camPos, NBL_CONST_REF_ARG(vector4_type) NDC, NBL_CONST_REF_ARG(matrix4x4_type) invMVP) | ||
| { | ||
| this_t retval; | ||
| retval.pixOffsetParam = pixOffsetParam; | ||
| retval.camPos = camPos; | ||
| retval.NDC = NDC; | ||
| retval.invMVP = invMVP; | ||
| return retval; | ||
| } |
Member
Author
There was a problem hiding this comment.
again, lets not make useless psedo-constructors
Comment on lines
52
to
62
| // #if POLYGON_METHOD==2 | ||
| // ray._immutable.normalAtOrigin = vec3(0.0,0.0,0.0); | ||
| // ray._immutable.wasBSDFAtOrigin = false; | ||
| // #endif | ||
|
|
||
| ray.payload.accumulation = (vector3_type)0.0; | ||
| ray.payload.otherTechniqueHeuristic = 0.0; // needed for direct eye-light paths | ||
| ray.payload.throughput = (vector3_type)1.0; | ||
| // #ifdef KILL_DIFFUSE_SPECULAR_PATHS | ||
| // ray._payload.hasDiffuse = false; | ||
| // #endif |
Member
Author
There was a problem hiding this comment.
payload shouldn't be initialized by raygen, just the direction
Comment on lines
39
to
47
| // apply stochastic reconstruction filter | ||
| const float gaussianFilterCutoff = 2.5; | ||
| const float truncation = nbl::hlsl::exp(-0.5 * gaussianFilterCutoff * gaussianFilterCutoff); | ||
| vector2_type remappedRand = randVec.xy; | ||
| remappedRand.x *= 1.0 - truncation; | ||
| remappedRand.x += truncation; | ||
| nbl::hlsl::sampling::BoxMullerTransform<scalar_type> boxMuller; | ||
| boxMuller.stddev = 1.5; | ||
| tmp.xy += pixOffsetParam * boxMuller(remappedRand); |
Member
Author
There was a problem hiding this comment.
wrap this up in another struct, this is a Stochastic Reconstruction Filter of which one can have Tent, Box, etc. this one is Gaussian
Comment on lines
1
to
18
| #ifndef _NBL_HLSL_EXT_RAYGEN_INCLUDED_ | ||
| #define _NBL_HLSL_EXT_RAYGEN_INCLUDED_ | ||
|
|
||
| #include <nbl/builtin/hlsl/sampling/box_muller_transform.hlsl> | ||
|
|
||
| #include "common.hlsl" | ||
|
|
||
| namespace RayGen | ||
| { | ||
|
|
||
| template<class Ray> | ||
| struct Basic | ||
| { | ||
| using this_t = Basic<Ray>; | ||
| using ray_type = Ray; | ||
| using scalar_type = typename Ray::scalar_type; | ||
| using vector3_type = typename Ray::vector3_type; | ||
|
|
Member
Author
There was a problem hiding this comment.
this looks useful put it in the path_tracing namespace and builtin directory as DefaultRayGen or BasicRayGen
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
@keptsecret after you merge
masteragain, you'll probably have the UI mess up and show changed from the merge commit, so close and reopen againTODO