Skip to content

Commit 37bc6cd

Browse files
Minor update to silencing warnings for D3D_FEATURE_LEVEL_12_2 on older SDKs
1 parent 4540839 commit 37bc6cd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ static const ShaderVersion HLSLValidateShaderVersion(const ShaderVersion& Versio
5555
static const ShaderVersion GetD3D11ShaderModel(D3D_FEATURE_LEVEL d3dDeviceFeatureLevel, const ShaderVersion& HLSLVersion)
5656
{
5757
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
58+
# pragma warning(push)
5859
# pragma warning(disable : 4063)
5960
#endif
6061
switch (d3dDeviceFeatureLevel)
@@ -88,7 +89,7 @@ static const ShaderVersion GetD3D11ShaderModel(D3D_FEATURE_LEVEL d3dDeviceFeatur
8889
return ShaderVersion{4, 0};
8990
}
9091
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
91-
# pragma warning(default : 4063)
92+
# pragma warning(pop)
9293
#endif
9394
}
9495

Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ RenderDeviceD3D12Impl::RenderDeviceD3D12Impl(IReferenceCounters* pRefCo
177177

178178
auto FeatureLevel = GetD3DFeatureLevelFromDevice(m_pd3d12Device);
179179
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
180+
# pragma warning(push)
180181
# pragma warning(disable : 4063)
181182
#endif
182183
switch (FeatureLevel)
@@ -191,7 +192,7 @@ RenderDeviceD3D12Impl::RenderDeviceD3D12Impl(IReferenceCounters* pRefCo
191192
default: UNEXPECTED("Unexpected D3D feature level");
192193
}
193194
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
194-
# pragma warning(default : 4063)
195+
# pragma warning(pop)
195196
#endif
196197

197198
// Detect maximum shader model.

0 commit comments

Comments
 (0)