Skip to content

Commit d2f331e

Browse files
committed
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
1 parent 1d4c9fc commit d2f331e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static const ShaderVersion HLSLValidateShaderVersion(const ShaderVersion& Versio
5454

5555
static const ShaderVersion GetD3D11ShaderModel(D3D_FEATURE_LEVEL d3dDeviceFeatureLevel, const ShaderVersion& HLSLVersion)
5656
{
57-
#ifdef _MSC_VER
57+
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
5858
# pragma warning(disable 4063)
5959
#endif
6060
switch (d3dDeviceFeatureLevel)
@@ -87,7 +87,7 @@ static const ShaderVersion GetD3D11ShaderModel(D3D_FEATURE_LEVEL d3dDeviceFeatur
8787
UNEXPECTED("Unexpected D3D feature level ", static_cast<Uint32>(d3dDeviceFeatureLevel));
8888
return ShaderVersion{4, 0};
8989
}
90-
#ifdef _MSC_VER
90+
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
9191
# pragma warning(default 4063)
9292
#endif
9393
}

Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ RenderDeviceD3D12Impl::RenderDeviceD3D12Impl(IReferenceCounters* pRefCo
176176
m_DeviceInfo.Features = EnableDeviceFeatures(m_AdapterInfo.Features, EngineCI.Features);
177177

178178
auto FeatureLevel = GetD3DFeatureLevelFromDevice(m_pd3d12Device);
179-
#ifdef _MSC_VER
179+
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
180180
# pragma warning(disable 4063)
181181
#endif
182182
switch (FeatureLevel)
@@ -190,7 +190,7 @@ RenderDeviceD3D12Impl::RenderDeviceD3D12Impl(IReferenceCounters* pRefCo
190190
case D3D_FEATURE_LEVEL_10_0: m_DeviceInfo.APIVersion = {10, 0}; break;
191191
default: UNEXPECTED("Unexpected D3D feature level");
192192
}
193-
#ifdef _MSC_VER
193+
#if defined(_MSC_VER) && !defined(NTDDI_WIN10_FE)
194194
# pragma warning(default 4063)
195195
#endif
196196

0 commit comments

Comments
 (0)