Skip to content

Commit aacda21

Browse files
authored
Merge pull request #920 from microsoft/chauvu-ser-sakura-forest-scene
Sakura Forest scene that executes the SER feature with pov controls and reflective floor
2 parents 85bbbb4 + bd25392 commit aacda21

36 files changed

+122656
-11
lines changed

Samples/Desktop/D3D12Raytracing/readme.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ This sample modifies the Hello World sample, illustrating Shader Execution Reord
5656

5757
![D3D12 Raytracing Shader Execution Reordering Sample GUI](src/D3D12RaytracingHelloShaderExecutionReordering/Screenshot_small.png)
5858

59-
## 6. [Opacity Micromaps Sample](src/D3D12RaytracingOpacityMicromaps/readme.md)
59+
## 6. [Sakura Forest - Shader Execution Reordering Sample](src/D3D12RaytracingSakuraForestSER/readme.md)
60+
This sample demonstrates Shader Execution Reordering (SER) in a more complex sakura forest scene. It shows how to use SER to give hints to the GPU for grouping threads based on hit group behaviour (HitObject), material coherence (e.g. reflectHint), or both to improve execution efficiency.
61+
62+
![D3D12 Raytracing Sakura Forest - Shader Execution Reordering Sample GUI](src/D3D12RaytracingSakuraForestSER/Screenshot_small.png)
63+
64+
## 7. [Opacity Micromaps Sample](src/D3D12RaytracingOpacityMicromaps/readme.md)
6065
This sample demonstrates how to use Opacity Micromaps with a tree model.
6166

6267
![D3D12 Raytracing Opacity Micromaps Sample GUI](src/D3D12RaytracingOpacityMicromaps/Screenshot_small.png)

Samples/Desktop/D3D12Raytracing/src/D3D12Raytracing.sln

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12RaytracingRealTimeDeno
3232
EndProject
3333
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12RaytracingLibrarySubobjects", "D3D12RaytracingLibrarySubobjects\D3D12RaytracingLibrarySubobjects.vcxproj", "{0AF699F0-99A8-4493-9FF7-1FFDE2900100}"
3434
EndProject
35-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12RaytracingHelloShaderExecutionReordering", "D3D12RaytracingHelloShaderExecutionReordering\D3D12RaytracingHelloShaderExecutionReordering.vcxproj", "{390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9}"
35+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12RaytracingHelloShaderExecutionReordering", "D3D12RaytracingHelloShaderExecutionReordering\D3D12RaytracingHelloShaderExecutionReordering.vcxproj", "{390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9}"
3636
EndProject
3737
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12OMMOfflineBaker", "D3D12OMMOfflineBaker\D3D12OMMOfflineBaker.vcxproj", "{2F201B6C-24B7-498C-A92A-07D4086EF6E9}"
3838
EndProject
39+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12RaytracingSakuraForestSER", "D3D12RaytracingSakuraForestSER\D3D12RaytracingSakuraForestSER.vcxproj", "{8A6F63FD-E766-476B-9748-9C14737297B7}"
40+
EndProject
3941
Global
4042
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4143
Debug|x64 = Debug|x64
@@ -97,16 +99,21 @@ Global
9799
{0AF699F0-99A8-4493-9FF7-1FFDE2900100}.Profile|x64.Build.0 = Release|x64
98100
{0AF699F0-99A8-4493-9FF7-1FFDE2900100}.Release|x64.ActiveCfg = Release|x64
99101
{0AF699F0-99A8-4493-9FF7-1FFDE2900100}.Release|x64.Build.0 = Release|x64
100-
{390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9}.Debug|x64.ActiveCfg = Debug|x64
101-
{390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9}.Debug|x64.Build.0 = Debug|x64
102-
{390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9}.Profile|x64.ActiveCfg = Release|x64
103-
{390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9}.Profile|x64.Build.0 = Release|x64
104-
{390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9}.Release|x64.ActiveCfg = Release|x64
105-
{390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9}.Release|x64.Build.0 = Release|x64
102+
{390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9}.Debug|x64.ActiveCfg = Debug|x64
103+
{390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9}.Debug|x64.Build.0 = Debug|x64
104+
{390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9}.Profile|x64.ActiveCfg = Release|x64
105+
{390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9}.Profile|x64.Build.0 = Release|x64
106+
{390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9}.Release|x64.ActiveCfg = Release|x64
107+
{390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9}.Release|x64.Build.0 = Release|x64
106108
{2F201B6C-24B7-498C-A92A-07D4086EF6E9}.Debug|x64.ActiveCfg = Debug|x64
107109
{2F201B6C-24B7-498C-A92A-07D4086EF6E9}.Profile|x64.ActiveCfg = Release|x64
108110
{2F201B6C-24B7-498C-A92A-07D4086EF6E9}.Release|x64.ActiveCfg = Release|x64
109-
111+
{8A6F63FD-E766-476B-9748-9C14737297B7}.Debug|x64.ActiveCfg = Debug|x64
112+
{8A6F63FD-E766-476B-9748-9C14737297B7}.Debug|x64.Build.0 = Debug|x64
113+
{8A6F63FD-E766-476B-9748-9C14737297B7}.Profile|x64.ActiveCfg = Release|x64
114+
{8A6F63FD-E766-476B-9748-9C14737297B7}.Profile|x64.Build.0 = Release|x64
115+
{8A6F63FD-E766-476B-9748-9C14737297B7}.Release|x64.ActiveCfg = Release|x64
116+
{8A6F63FD-E766-476B-9748-9C14737297B7}.Release|x64.Build.0 = Release|x64
110117
EndGlobalSection
111118
GlobalSection(SolutionProperties) = preSolution
112119
HideSolutionNode = FALSE
@@ -123,9 +130,9 @@ Global
123130
{0C266269-AC0C-41B0-9D25-0117DC23CFC7} = {22B9FE19-4D5A-4F3F-ABEA-F9ACB1574331}
124131
{19585C81-FB12-4A4B-B700-CCE253BDBA02} = {024FAECC-CCE3-4B06-9F06-C83FB58877EF}
125132
{0AF699F0-99A8-4493-9FF7-1FFDE2900100} = {22B9FE19-4D5A-4F3F-ABEA-F9ACB1574331}
126-
{390a4d56-ff1b-4ca0-81ca-ac8ed273bfc9} = {22B9FE19-4D5A-4F3F-ABEA-F9ACB1574331}
133+
{390A4D56-FF1B-4CA0-81CA-AC8ED273BFC9} = {22B9FE19-4D5A-4F3F-ABEA-F9ACB1574331}
127134
{2F201B6C-24B7-498C-A92A-07D4086EF6E9} = {22B9FE19-4D5A-4F3F-ABEA-F9ACB1574331}
128-
135+
{8A6F63FD-E766-476B-9748-9C14737297B7} = {22B9FE19-4D5A-4F3F-ABEA-F9ACB1574331}
129136
EndGlobalSection
130137
GlobalSection(ExtensibilityGlobals) = postSolution
131138
SolutionGuid = {F763A25B-2115-4E87-87C4-2C6AA75C1542}

0 commit comments

Comments
 (0)