Skip to content

Commit a03d21a

Browse files
csyonghecsyonghe
authored
[gfx] Add inline ray tracing support. (shader-slang#1899)
1 parent 5395ef8 commit a03d21a

29 files changed

+2384
-335
lines changed

‎build/visual-studio/ray-tracing/ray-tracing.vcxproj

+193
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{71AC0F50-5DFD-FA91-8661-E95372118EFB}</ProjectGuid>
23+
<IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
24+
<Keyword>Win32Proj</Keyword>
25+
<RootNamespace>ray-tracing</RootNamespace>
26+
</PropertyGroup>
27+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29+
<ConfigurationType>Application</ConfigurationType>
30+
<UseDebugLibraries>true</UseDebugLibraries>
31+
<CharacterSet>Unicode</CharacterSet>
32+
<PlatformToolset>v141</PlatformToolset>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
35+
<ConfigurationType>Application</ConfigurationType>
36+
<UseDebugLibraries>true</UseDebugLibraries>
37+
<CharacterSet>Unicode</CharacterSet>
38+
<PlatformToolset>v141</PlatformToolset>
39+
</PropertyGroup>
40+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
41+
<ConfigurationType>Application</ConfigurationType>
42+
<UseDebugLibraries>false</UseDebugLibraries>
43+
<CharacterSet>Unicode</CharacterSet>
44+
<PlatformToolset>v141</PlatformToolset>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
47+
<ConfigurationType>Application</ConfigurationType>
48+
<UseDebugLibraries>false</UseDebugLibraries>
49+
<CharacterSet>Unicode</CharacterSet>
50+
<PlatformToolset>v141</PlatformToolset>
51+
</PropertyGroup>
52+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
53+
<ImportGroup Label="ExtensionSettings">
54+
</ImportGroup>
55+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
56+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57+
</ImportGroup>
58+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
59+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
</ImportGroup>
61+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
62+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63+
</ImportGroup>
64+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
65+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66+
</ImportGroup>
67+
<PropertyGroup Label="UserMacros" />
68+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
69+
<LinkIncremental>true</LinkIncremental>
70+
<OutDir>..\..\..\bin\windows-x86\debug\</OutDir>
71+
<IntDir>..\..\..\intermediate\windows-x86\debug\ray-tracing\</IntDir>
72+
<TargetName>ray-tracing</TargetName>
73+
<TargetExt>.exe</TargetExt>
74+
</PropertyGroup>
75+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
76+
<LinkIncremental>true</LinkIncremental>
77+
<OutDir>..\..\..\bin\windows-x64\debug\</OutDir>
78+
<IntDir>..\..\..\intermediate\windows-x64\debug\ray-tracing\</IntDir>
79+
<TargetName>ray-tracing</TargetName>
80+
<TargetExt>.exe</TargetExt>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
83+
<LinkIncremental>false</LinkIncremental>
84+
<OutDir>..\..\..\bin\windows-x86\release\</OutDir>
85+
<IntDir>..\..\..\intermediate\windows-x86\release\ray-tracing\</IntDir>
86+
<TargetName>ray-tracing</TargetName>
87+
<TargetExt>.exe</TargetExt>
88+
</PropertyGroup>
89+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
90+
<LinkIncremental>false</LinkIncremental>
91+
<OutDir>..\..\..\bin\windows-x64\release\</OutDir>
92+
<IntDir>..\..\..\intermediate\windows-x64\release\ray-tracing\</IntDir>
93+
<TargetName>ray-tracing</TargetName>
94+
<TargetExt>.exe</TargetExt>
95+
</PropertyGroup>
96+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
97+
<ClCompile>
98+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
99+
<WarningLevel>Level3</WarningLevel>
100+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101+
<AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
103+
<Optimization>Disabled</Optimization>
104+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
105+
</ClCompile>
106+
<Link>
107+
<SubSystem>Windows</SubSystem>
108+
<GenerateDebugInformation>true</GenerateDebugInformation>
109+
</Link>
110+
</ItemDefinitionGroup>
111+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
112+
<ClCompile>
113+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
114+
<WarningLevel>Level3</WarningLevel>
115+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116+
<AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
117+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
118+
<Optimization>Disabled</Optimization>
119+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
120+
</ClCompile>
121+
<Link>
122+
<SubSystem>Windows</SubSystem>
123+
<GenerateDebugInformation>true</GenerateDebugInformation>
124+
</Link>
125+
</ItemDefinitionGroup>
126+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
127+
<ClCompile>
128+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
129+
<WarningLevel>Level3</WarningLevel>
130+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131+
<AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132+
<Optimization>Full</Optimization>
133+
<FunctionLevelLinking>true</FunctionLevelLinking>
134+
<IntrinsicFunctions>true</IntrinsicFunctions>
135+
<MinimalRebuild>false</MinimalRebuild>
136+
<StringPooling>true</StringPooling>
137+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
138+
</ClCompile>
139+
<Link>
140+
<SubSystem>Windows</SubSystem>
141+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
142+
<OptimizeReferences>true</OptimizeReferences>
143+
</Link>
144+
</ItemDefinitionGroup>
145+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
146+
<ClCompile>
147+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
148+
<WarningLevel>Level3</WarningLevel>
149+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
150+
<AdditionalIncludeDirectories>..\..\..;..\..\..\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
151+
<Optimization>Full</Optimization>
152+
<FunctionLevelLinking>true</FunctionLevelLinking>
153+
<IntrinsicFunctions>true</IntrinsicFunctions>
154+
<MinimalRebuild>false</MinimalRebuild>
155+
<StringPooling>true</StringPooling>
156+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
157+
</ClCompile>
158+
<Link>
159+
<SubSystem>Windows</SubSystem>
160+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
161+
<OptimizeReferences>true</OptimizeReferences>
162+
</Link>
163+
</ItemDefinitionGroup>
164+
<ItemGroup>
165+
<ClCompile Include="..\..\..\examples\ray-tracing\main.cpp" />
166+
</ItemGroup>
167+
<ItemGroup>
168+
<None Include="..\..\..\examples\ray-tracing\shaders.slang" />
169+
</ItemGroup>
170+
<ItemGroup>
171+
<ProjectReference Include="..\example-base\example-base.vcxproj">
172+
<Project>{37BED5B5-23FA-D81F-8C0C-F1167867813A}</Project>
173+
</ProjectReference>
174+
<ProjectReference Include="..\slang\slang.vcxproj">
175+
<Project>{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}</Project>
176+
</ProjectReference>
177+
<ProjectReference Include="..\gfx\gfx.vcxproj">
178+
<Project>{222F7498-B40C-4F3F-A704-DDEB91A4484A}</Project>
179+
</ProjectReference>
180+
<ProjectReference Include="..\gfx-util\gfx-util.vcxproj">
181+
<Project>{F5ADB74E-02A7-44FB-AA3B-FC02F8AC7A4B}</Project>
182+
</ProjectReference>
183+
<ProjectReference Include="..\platform\platform.vcxproj">
184+
<Project>{3565FE5E-4FA3-11EB-AE93-0242AC130002}</Project>
185+
</ProjectReference>
186+
<ProjectReference Include="..\core\core.vcxproj">
187+
<Project>{F9BE7957-8399-899E-0C49-E714FDDD4B65}</Project>
188+
</ProjectReference>
189+
</ItemGroup>
190+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
191+
<ImportGroup Label="ExtensionTargets">
192+
</ImportGroup>
193+
</Project>

‎build/visual-studio/ray-tracing/ray-tracing.vcxproj.filters

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
6+
</Filter>
7+
</ItemGroup>
8+
<ItemGroup>
9+
<ClCompile Include="..\..\..\examples\ray-tracing\main.cpp">
10+
<Filter>Source Files</Filter>
11+
</ClCompile>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<None Include="..\..\..\examples\ray-tracing\shaders.slang">
15+
<Filter>Source Files</Filter>
16+
</None>
17+
</ItemGroup>
18+
</Project>

‎examples/example-base/example-base.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
using namespace Slang;
1010
using namespace gfx;
1111

12-
Slang::Result WindowedAppBase::initializeBase(const char* title, int width, int height)
12+
Slang::Result WindowedAppBase::initializeBase(
13+
const char* title,
14+
int width,
15+
int height,
16+
DeviceType deviceType)
1317
{
1418
// Create a window for our application to render into.
1519
//
@@ -30,7 +34,7 @@ Slang::Result WindowedAppBase::initializeBase(const char* title, int width, int
3034
gfxEnableDebugLayer();
3135
#endif
3236
IDevice::Desc deviceDesc = {};
33-
// deviceDesc.slang.targetFlags = SLANG_TARGET_FLAG_DUMP_IR;
37+
deviceDesc.deviceType = deviceType;
3438
gfx::Result res = gfxCreateDevice(&deviceDesc, gDevice.writeRef());
3539
if (SLANG_FAILED(res))
3640
return res;

‎examples/example-base/example-base.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ struct WindowedAppBase
2626
Slang::ComPtr<gfx::IRenderPassLayout> gRenderPass;
2727
Slang::ComPtr<gfx::ICommandQueue> gQueue;
2828

29-
Slang::Result initializeBase(const char* titile, int width, int height);
29+
Slang::Result initializeBase(
30+
const char* titile,
31+
int width,
32+
int height,
33+
gfx::DeviceType deviceType = gfx::DeviceType::Default);
3034
void createSwapchainFramebuffers();
3135
void mainLoop();
3236

‎examples/gpu-printing/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Result execute()
109109
printBufferDesc.defaultState = ResourceState::UnorderedAccess;
110110
printBufferDesc.allowedStates = ResourceStateSet(
111111
ResourceState::CopySource, ResourceState::CopyDestination, ResourceState::UnorderedAccess);
112-
printBufferDesc.cpuAccessFlags = IResource::AccessFlag::Read; // | Resource::AccessFlag::Write;
112+
printBufferDesc.cpuAccessFlags = AccessFlag::Read; // | Resource::AccessFlag::Write;
113113
auto printBuffer = gDevice->createBufferResource(printBufferDesc);
114114

115115
IResourceView::Desc printBufferViewDesc;

‎examples/ray-tracing/README.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Slang "Ray Tracing" Example
2+
===========================
3+
4+
The goal of this example is to demonstrate how to use hardware ray-tracing in Slang.
5+
6+
The `shaders.slang` file contains a compute shader that traces primary rays from camera and shade intersections with basic lighting + ray-traced shadows. The file also defines a vertex and a fragment shader entry point for displaying the ray-traced image produced by the compute shader.
7+
8+
The `main.cpp` file contains the C++ application code, showing how to use the Slang API to load and compile the shader code, and how to use a graphics API abstraction layer implemented in `tools/gfx` to initiate hardware ray-tracing.
9+
Note that this abstraction layer is *not* required in order to work with Slang, and it is just there to help us write example and test applications more conveniently.

0 commit comments

Comments
 (0)