diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-09-02 23:00:11 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-09-02 23:00:11 +0000 |
| commit | 2a058abd2099d31aa12dd01fefe5689516ca3f77 (patch) | |
| tree | 1797e2c0a5fa24f4a02a5c2ae29eda40ec655201 /Graphics/GraphicsEngineD3DBase | |
| parent | added argument --comp=dxc to run tests with DXC compiler (diff) | |
| download | DiligentCore-2a058abd2099d31aa12dd01fefe5689516ca3f77.tar.gz DiligentCore-2a058abd2099d31aa12dd01fefe5689516ca3f77.zip | |
fixed compilation on UWP
Diffstat (limited to 'Graphics/GraphicsEngineD3DBase')
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp index 1dec5e4f..48132a4b 100644 --- a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp +++ b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp @@ -346,8 +346,11 @@ ShaderD3DBase::ShaderD3DBase(const ShaderCreateInfo& ShaderCI, const ShaderVersi if (ShaderModel.Major == MaxSM.Major && ShaderModel.Minor > MaxSM.Minor) ShaderModel = MaxSM; } + else + m_isDXIL = false; } - else + + if (!m_isDXIL) { ShaderModel = (ShaderModel.Major < 6 ? ShaderModel : (IsD3D12 ? ShaderVersion{5, 1} : ShaderVersion{5, 0})); } |