Skip to content

Commit 7bda9a3

Browse files
authored
Compile shaders with HLSL 2021 even with older DXC (#876)
1 parent 35f6060 commit 7bda9a3

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

MiniEngine/PropertySheets/Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<ObjectFileOutput />
6565
<EnableDebuggingInformation Condition="'$(Configuration)'=='Debug'">true</EnableDebuggingInformation>
6666
<AdditionalOptions Condition="'$(Configuration)'=='Debug'">-Qembed_debug %(AdditionalOptions)</AdditionalOptions>
67+
<AdditionalOptions>-HV 2021 %(AdditionalOptions)</AdditionalOptions>
6768
</FxCompile>
6869
</ItemDefinitionGroup>
6970
</Project>

Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingProceduralGeometry/D3D12RaytracingProceduralGeometry.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
</CustomBuild>
9494
<FxCompile>
9595
<EntryPointName />
96+
<AdditionalOptions>-HV 2021 %(AdditionalOptions)</AdditionalOptions>
9697
</FxCompile>
9798
<PostBuildEvent>
9899
</PostBuildEvent>
@@ -141,6 +142,7 @@
141142
</CustomBuild>
142143
<FxCompile>
143144
<EntryPointName />
145+
<AdditionalOptions>-HV 2021 %(AdditionalOptions)</AdditionalOptions>
144146
</FxCompile>
145147
<PostBuildEvent>
146148
</PostBuildEvent>

Samples/Desktop/D3D12Raytracing/src/D3D12RaytracingRealTimeDenoisedAmbientOcclusion/D3D12RaytracingRealTimeDenoisedAmbientOcclusion.vcxproj

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,17 @@
7373
<IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
7474
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)..\Build_VS15\$(Platform)\$(Configuration)\Output\$(ProjectName)</IncludePath>
7575
</PropertyGroup>
76+
<ItemDefinitionGroup>
77+
<FxCompile>
78+
<EntryPointName></EntryPointName>
79+
<ObjectFileOutput></ObjectFileOutput>
80+
<AdditionalIncludeDirectories>$(ProjectDir);RTAO/shaders;SampleCore/shaders;SampleCore/shaders/util</AdditionalIncludeDirectories>
81+
<ShaderType>Compute</ShaderType>
82+
<ShaderModel>6.3</ShaderModel>
83+
<VariableName>g_p%(Filename)</VariableName>
84+
<AdditionalOptions>-HV 2021 %(AdditionalOptions)</AdditionalOptions>
85+
</FxCompile>
86+
</ItemDefinitionGroup>
7687
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7788
<ClCompile>
7889
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -102,12 +113,6 @@
102113
<TreatOutputAsContent>true</TreatOutputAsContent>
103114
</CustomBuild>
104115
<FxCompile>
105-
<EntryPointName></EntryPointName>
106-
<ObjectFileOutput></ObjectFileOutput>
107-
<AdditionalIncludeDirectories>$(ProjectDir);RTAO/shaders;SampleCore/shaders;SampleCore/shaders/util</AdditionalIncludeDirectories>
108-
<ShaderType>Compute</ShaderType>
109-
<ShaderModel>6.3</ShaderModel>
110-
<VariableName>g_p%(Filename)</VariableName>
111116
<DisableOptimizations>false</DisableOptimizations>
112117
<EnableDebuggingInformation Condition="'$(Configuration)'=='Debug'">true</EnableDebuggingInformation>
113118
<AdditionalOptions Condition="'$(Configuration)'=='Debug'">-Qembed_debug %(AdditionalOptions)</AdditionalOptions>
@@ -143,11 +148,6 @@
143148
<Outputs>$(OutDir)\%(Identity)</Outputs>
144149
<TreatOutputAsContent>true</TreatOutputAsContent>
145150
</CustomBuild>
146-
<FxCompile>
147-
<EntryPointName></EntryPointName>
148-
<ObjectFileOutput></ObjectFileOutput>
149-
<AdditionalIncludeDirectories>$(ProjectDir);RTAO/shaders;SampleCore/shaders;SampleCore/shaders/util</AdditionalIncludeDirectories>
150-
</FxCompile>
151151
</ItemDefinitionGroup>
152152
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
153153
<ClCompile>
@@ -179,9 +179,6 @@
179179
<Outputs>$(OutDir)\%(Identity)</Outputs>
180180
<TreatOutputAsContent>true</TreatOutputAsContent>
181181
</CustomBuild>
182-
<FxCompile>
183-
<AdditionalIncludeDirectories>$(ProjectDir);RTAO/shaders;SampleCore/shaders;SampleCore/shaders/util</AdditionalIncludeDirectories>
184-
</FxCompile>
185182
</ItemDefinitionGroup>
186183
<ItemGroup>
187184
<ClInclude Include="SampleCore\Composition.h" />

0 commit comments

Comments
 (0)