Skip to content

Commit

Permalink
Minor update to silencing warnings for D3D_FEATURE_LEVEL_12_2 on olde…
Browse files Browse the repository at this point in the history
…r SDKs
  • Loading branch information
TheMostDiligent committed Nov 27, 2024
1 parent 4540839 commit 37bc6cd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ static const ShaderVersion HLSLValidateShaderVersion(const ShaderVersion& Versio
static const ShaderVersion GetD3D11ShaderModel(D3D_FEATURE_LEVEL d3dDeviceFeatureLevel, const ShaderVersion& HLSLVersion)
{
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
# pragma warning(push)
# pragma warning(disable : 4063)
#endif
switch (d3dDeviceFeatureLevel)
Expand Down Expand Up @@ -88,7 +89,7 @@ static const ShaderVersion GetD3D11ShaderModel(D3D_FEATURE_LEVEL d3dDeviceFeatur
return ShaderVersion{4, 0};
}
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
# pragma warning(default : 4063)
# pragma warning(pop)
#endif
}

Expand Down
3 changes: 2 additions & 1 deletion Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ RenderDeviceD3D12Impl::RenderDeviceD3D12Impl(IReferenceCounters* pRefCo

auto FeatureLevel = GetD3DFeatureLevelFromDevice(m_pd3d12Device);
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
# pragma warning(push)
# pragma warning(disable : 4063)
#endif
switch (FeatureLevel)
Expand All @@ -191,7 +192,7 @@ RenderDeviceD3D12Impl::RenderDeviceD3D12Impl(IReferenceCounters* pRefCo
default: UNEXPECTED("Unexpected D3D feature level");
}
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
# pragma warning(default : 4063)
# pragma warning(pop)
#endif

// Detect maximum shader model.
Expand Down

0 comments on commit 37bc6cd

Please sign in to comment.