Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Switch depth buffer to position buffer with ray-tracing #397

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch depth buffer to position buffer with ray-tracing #397

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
51f4e33
[CHANGE] The reflection and shadow raytracing tasks now use the posit…
161563 Jun 24, 2019
2f4f280
Merge branch 'master' of https://github.com/TeamWisp/Procedural-Ray-T…
161563 Jun 25, 2019
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
3 changes: 2 additions & 1 deletion resources/shaders/dxr_reflection_main.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Texture2D g_textures[1000] : register(t10);
Texture2D gbuffer_albedo : register(t1010);
Texture2D gbuffer_normal : register(t1011);
Texture2D gbuffer_depth : register(t1012);
Texture2D gbuffer_position : register(t1013);
TextureCube skybox : register(t6);
Texture2D brdf_lut : register(t8);
TextureCube irradiance_map : register(t9);
Expand Down Expand Up @@ -84,7 +85,7 @@ void ReflectionRaygenEntry()

// Unpack G-Buffer
float depth = gbuffer_depth.SampleLevel(s0, uv, 0).x;
float3 wpos = unpack_position(float2(uv.x, 1.f - uv.y), depth, inv_vp);
float3 wpos = gbuffer_position.SampleLevel(s0, uv, 0).xyz;
float3 albedo = albedo_roughness.rgb;
float roughness = albedo_roughness.w;
float3 normal = normal_metallic.xyz;
Expand Down
3 changes: 2 additions & 1 deletion resources/shaders/dxr_shadow_main.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Texture2D g_textures[1000] : register(t10);
Texture2D gbuffer_albedo : register(t1010);
Texture2D gbuffer_normal : register(t1011);
Texture2D gbuffer_depth : register(t1012);
Texture2D gbuffer_position : register(t1013);
TextureCube skybox : register(t6);
Texture2D brdf_lut : register(t8);
TextureCube irradiance_map : register(t9);
Expand Down Expand Up @@ -83,7 +84,7 @@ void ShadowRaygenEntry()

// Unpack G-Buffer
float depth = gbuffer_depth[screen_co].x;
float3 wpos = unpack_position(float2(uv.x, 1.f - uv.y), depth, inv_vp);
float3 wpos = gbuffer_position.SampleLevel(s0, uv, 0).xyz;
float3 normal = normal_metallic.xyz;

// Do lighting
Expand Down
2 changes: 1 addition & 1 deletion src/engine_registry.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ namespace wr
rs_layout::Entry{(int)RTHybridE::BRDF_LUT, 1, rs_layout::Type::SRV_RANGE},
rs_layout::Entry{(int)RTHybridE::IRRADIANCE_MAP, 1, rs_layout::Type::SRV_RANGE},
rs_layout::Entry{(int)RTHybridE::TEXTURES, d3d12::settings::num_max_rt_textures, rs_layout::Type::SRV_RANGE},
rs_layout::Entry{(int)RTHybridE::GBUFFERS, 3, rs_layout::Type::SRV_RANGE},
rs_layout::Entry{(int)RTHybridE::GBUFFERS, 4, rs_layout::Type::SRV_RANGE},
rs_layout::Entry{(int)RTHybridE::FALLBACK_PTRS, 9, rs_layout::Type::SRV_RANGE},
};

Expand Down
3 changes: 3 additions & 0 deletions src/render_tasks/d3d12_rt_hybrid_helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ namespace wr
DescriptorAllocation out_gbuffer_albedo_alloc;
DescriptorAllocation out_gbuffer_normal_alloc;
DescriptorAllocation out_gbuffer_depth_alloc;
DescriptorAllocation out_gbuffer_position_alloc;

bool tlas_requires_init = false;
};
Expand Down Expand Up @@ -147,11 +148,13 @@ namespace wr
auto albedo_handle = data.out_gbuffer_albedo_alloc.GetDescriptorHandle();
auto normal_handle = data.out_gbuffer_normal_alloc.GetDescriptorHandle();
auto depth_handle = data.out_gbuffer_depth_alloc.GetDescriptorHandle();
auto position_handle = data.out_gbuffer_position_alloc.GetDescriptorHandle();

auto deferred_main_rt = data.out_deferred_main_rt = static_cast<d3d12::RenderTarget*>(fg.GetPredecessorRenderTarget<DeferredMainTaskData>());

d3d12::CreateSRVFromSpecificRTV(deferred_main_rt, albedo_handle, 0, deferred_main_rt->m_create_info.m_rtv_formats[0]);
d3d12::CreateSRVFromSpecificRTV(deferred_main_rt, normal_handle, 1, deferred_main_rt->m_create_info.m_rtv_formats[1]);
d3d12::CreateSRVFromSpecificRTV(deferred_main_rt, position_handle, 5, deferred_main_rt->m_create_info.m_rtv_formats[5]);

d3d12::CreateSRVFromDSV(deferred_main_rt, depth_handle);
}
Expand Down
3 changes: 3 additions & 0 deletions src/render_tasks/d3d12_rt_reflection_task.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ namespace wr
data.base_data.out_gbuffer_albedo_alloc = std::move(as_build_data.out_allocator->Allocate());
data.base_data.out_gbuffer_normal_alloc = std::move(as_build_data.out_allocator->Allocate());
data.base_data.out_gbuffer_depth_alloc = std::move(as_build_data.out_allocator->Allocate());
data.base_data.out_gbuffer_position_alloc = std::move(as_build_data.out_allocator->Allocate());

data.base_data.tlas_requires_init = true;
}
Expand Down Expand Up @@ -142,6 +143,8 @@ namespace wr
auto out_scene_depth_handle = data.base_data.out_gbuffer_depth_alloc.GetDescriptorHandle();
d3d12::SetRTShaderSRV(cmd_list, 0, COMPILATION_EVAL(rs_layout::GetHeapLoc(params::rt_hybrid, params::RTHybridE::GBUFFERS)) + 2, out_scene_depth_handle);

auto out_scene_position_handle = data.base_data.out_gbuffer_position_alloc.GetDescriptorHandle();
d3d12::SetRTShaderSRV(cmd_list, 0, COMPILATION_EVAL(rs_layout::GetHeapLoc(params::rt_hybrid, params::RTHybridE::GBUFFERS)) + 3, out_scene_position_handle);
/*
To keep the CopyDescriptors function happy, we need to fill the descriptor table with valid descriptors
We fill the table with a single descriptor, then overwrite some spots with the he correct textures
Expand Down
4 changes: 4 additions & 0 deletions src/render_tasks/d3d12_rt_shadow_task.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ namespace wr
data.base_data.out_gbuffer_albedo_alloc = std::move(as_build_data.out_allocator->Allocate());
data.base_data.out_gbuffer_normal_alloc = std::move(as_build_data.out_allocator->Allocate());
data.base_data.out_gbuffer_depth_alloc = std::move(as_build_data.out_allocator->Allocate());
data.base_data.out_gbuffer_position_alloc = std::move(as_build_data.out_allocator->Allocate());

data.base_data.tlas_requires_init = true;
}
Expand Down Expand Up @@ -157,6 +158,9 @@ namespace wr
auto out_scene_depth_handle = data.base_data.out_gbuffer_depth_alloc.GetDescriptorHandle();
d3d12::SetRTShaderSRV(cmd_list, 0, COMPILATION_EVAL(rs_layout::GetHeapLoc(params::rt_hybrid, params::RTHybridE::GBUFFERS)) + 2, out_scene_depth_handle);

auto out_scene_position_handle = data.base_data.out_gbuffer_position_alloc.GetDescriptorHandle();
d3d12::SetRTShaderSRV(cmd_list, 0, COMPILATION_EVAL(rs_layout::GetHeapLoc(params::rt_hybrid, params::RTHybridE::GBUFFERS)) + 3, out_scene_position_handle);

/*
To keep the CopyDescriptors function happy, we need to fill the descriptor table with valid descriptors
We fill the table with a single descriptor, then overwrite some spots with the he correct textures
Expand Down