diff options
| author | azhirnov <zh1dron@gmail.com> | 2020-09-08 21:40:07 +0000 |
|---|---|---|
| committer | azhirnov <zh1dron@gmail.com> | 2020-09-08 21:40:07 +0000 |
| commit | 7fd927902f00a72909f3c124cbd194c9ffc130c9 (patch) | |
| tree | 5574f427e0f3355fc6b4264820e891eb10b0fce5 /Graphics | |
| parent | Merge branch 'master' into mesh_shader (diff) | |
| download | DiligentCore-7fd927902f00a72909f3c124cbd194c9ffc130c9.tar.gz DiligentCore-7fd927902f00a72909f3c124cbd194c9ffc130c9.zip | |
fixed cmake, removed unused code
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GLSLTools/src/SPIRVUtils.cpp | 12 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/Graphics/GLSLTools/src/SPIRVUtils.cpp b/Graphics/GLSLTools/src/SPIRVUtils.cpp index f550e88e..5ae9d3a1 100644 --- a/Graphics/GLSLTools/src/SPIRVUtils.cpp +++ b/Graphics/GLSLTools/src/SPIRVUtils.cpp @@ -44,18 +44,6 @@ #include "spirv-tools/optimizer.hpp" -// SPIRV-Tools source -#ifdef _MSC_VER -# pragma warning(push, 0) -#endif -#include "source/opt/ir_context.h" -#include "source/opt/module.h" -#include "source/opt/pass.h" -#include "source/opt/instruction.h" -#ifdef _MSC_VER -# pragma warning(pop) -#endif - // clang-format off static const char g_HLSLDefinitions[] = { diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt index 40a0f219..497a4e0b 100644 --- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt +++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt @@ -228,6 +228,8 @@ endif() if(EXISTS ${DXC_SPIRV_PATH}) set(DILIGENT_DXCOMPILER_FOR_SPIRV_PATH "${DXC_SPIRV_PATH}" CACHE INTERNAL "" FORCE) message(STATUS "Found DXCompiler for Vulkan") +else() + set(DILIGENT_DXCOMPILER_FOR_SPIRV_PATH "" CACHE INTERNAL "" FORCE) endif() if(PLATFORM_WIN32) |