diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-08-19 20:55:26 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-08-19 20:55:26 +0000 |
| commit | 882d621fe50027dedbb69f3f84e5c294656f6c6b (patch) | |
| tree | e7a4e16a14dfc0ad57dced8833e1ee99a20aea5b /Graphics/GraphicsEngineD3D12 | |
| parent | minor fixes and formatting (diff) | |
| download | DiligentCore-882d621fe50027dedbb69f3f84e5c294656f6c6b.tar.gz DiligentCore-882d621fe50027dedbb69f3f84e5c294656f6c6b.zip | |
Removed macros HAS_D12_DXIL_COMPILER
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp | 5 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp index 86ccaa02..768983da 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp @@ -40,13 +40,8 @@ static ShaderVersion GetD3D12ShaderModel(RenderDeviceD3D12Impl* pDevice, const S { if (HLSLVersion.Major == 0 && HLSLVersion.Minor == 0) { -#ifdef HAS_D12_DXIL_COMPILER D3D_SHADER_MODEL ver = pDevice->GetShaderModel(); return ShaderVersion{Uint8((ver >> 4) & 0xF), Uint8(ver & 0xF)}; -#else - // without DXIL compiler you can use only SM 5.1 - return ShaderVersion{5, 1}; -#endif } else { diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp index f3680ee7..e2093eaa 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp @@ -58,7 +58,6 @@ ShaderResourcesD3D12::ShaderResourcesD3D12(ID3DBlob* pShaderBytecode, bool isDXI if (isDXIL) { -#ifdef HAS_D12_DXIL_COMPILER const uint32_t DFCC_DXIL = uint32_t('D') | (uint32_t('X') << 8) | (uint32_t('I') << 16) | (uint32_t('L') << 24); CComPtr<IDxcContainerReflection> pReflection; UINT32 shaderIdx; @@ -70,9 +69,6 @@ ShaderResourcesD3D12::ShaderResourcesD3D12(ID3DBlob* pShaderBytecode, bool isDXI CHECK_D3D_RESULT_THROW(hr, "Failed to find DXIL part"); hr = pReflection->GetPartReflection(shaderIdx, __uuidof(pShaderReflection), reinterpret_cast<void**>(&pShaderReflection)); CHECK_D3D_RESULT_THROW(hr, "Failed to get the shader reflection"); -#else - LOG_ERROR_AND_THROW("DXIL compiler is not supported"); -#endif } else { |