From b16eb592cc31b7cc9ba3d2f9525486c282996a9e Mon Sep 17 00:00:00 2001 From: Lujin Wang <143145775+lujinwangnv@users.noreply.github.com> Date: Fri, 30 May 2025 12:52:55 -0700 Subject: Change SLANG_OVERRIDE_xxx_PATH and fix header file path (#7207) * Fix lua header file path Add two missed files in #7167 * Fix lua header file path Add two missed files in #7167 * Leave lua/ in the path to avoid name conflict * Remove xxx from path of SLANG_OVERRIDE_xxx_PATH Change SLANG_OVERRIDE_xxx_PATH from path-to-parent-folder/xxx to path-to-parent-folder and add "xxx/" back to "#include", which helps to avoid the potential name conflict of external tools. * format code --------- Co-authored-by: Yong He Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- tools/gfx/vulkan/glslang-module.h | 2 +- tools/gfx/vulkan/vk-shader-program.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/gfx/vulkan') diff --git a/tools/gfx/vulkan/glslang-module.h b/tools/gfx/vulkan/glslang-module.h index fc3e2861d..16fca5ce9 100644 --- a/tools/gfx/vulkan/glslang-module.h +++ b/tools/gfx/vulkan/glslang-module.h @@ -2,11 +2,11 @@ #pragma once #include "core/slang-list.h" -#include "include/spirv-tools/linker.hpp" #include "slang-com-helper.h" #include "slang-com-ptr.h" #include "slang-glslang/slang-glslang.h" #include "slang.h" +#include "spirv-tools/include/spirv-tools/linker.hpp" namespace gfx { diff --git a/tools/gfx/vulkan/vk-shader-program.cpp b/tools/gfx/vulkan/vk-shader-program.cpp index a7e754b6c..dbe2cbb82 100644 --- a/tools/gfx/vulkan/vk-shader-program.cpp +++ b/tools/gfx/vulkan/vk-shader-program.cpp @@ -1,7 +1,7 @@ // vk-shader-program.cpp #include "vk-shader-program.h" -#include "include/spirv-tools/linker.hpp" +#include "spirv-tools/include/spirv-tools/linker.hpp" #include "vk-device.h" #include "vk-util.h" -- cgit v1.2.3