diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-08-19 15:53:37 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-08-19 15:53:37 +0000 |
| commit | 7b30ece38d8e18b033a1a02a27c2784954efce79 (patch) | |
| tree | 427b927b24b62cba28a1380d6cfae801074553f1 /Graphics/GraphicsEngineD3D12 | |
| parent | Use ShaderVersion instead of Uint8 (diff) | |
| download | DiligentCore-7b30ece38d8e18b033a1a02a27c2784954efce79.tar.gz DiligentCore-7b30ece38d8e18b033a1a02a27c2784954efce79.zip | |
Rename HAS_DXIL_COMPILER to HAS_D12_DXIL_COMPILER
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index 8cf3cc46..b7215a64 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -179,11 +179,11 @@ PUBLIC target_compile_definitions(Diligent-GraphicsEngineD3D12-shared PUBLIC ENGINE_DLL=1) if(${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} STRGREATER_EQUAL "10.0.19041.0") + set(D12_H_HAS_MESH_SHADER ON CACHE INTERNAL "" FORCE) target_compile_definitions(Diligent-GraphicsEngineD3D12-static PRIVATE D12_H_HAS_MESH_SHADER) endif() -if(${HAS_DXIL_COMPILER}) - target_compile_definitions(Diligent-GraphicsEngineD3D12-static PRIVATE HAS_DXIL_COMPILER) - target_link_libraries(Diligent-GraphicsEngineD3D12-static PRIVATE dxcompiler.lib) +if(${HAS_D12_DXIL_COMPILER}) + target_compile_definitions(Diligent-GraphicsEngineD3D12-static PRIVATE HAS_D12_DXIL_COMPILER) endif() # Set output name to GraphicsEngineD3D12_{32|64}{r|d} diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp index 4d858503..b447c036 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp @@ -32,10 +32,6 @@ #include "ShaderD3DBase.hpp" #include "ShaderBase.hpp" -#ifdef HAS_DXIL_COMPILER -# include "dxcapi.h" -#endif - namespace Diligent { @@ -62,7 +58,7 @@ ShaderResourcesD3D12::ShaderResourcesD3D12(ID3DBlob* pShaderBytecode, bool isDXI if (isDXIL) { -#ifdef HAS_DXIL_COMPILER +#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; |