From 7b570feed42976a6e787d79a70aaf8e667745e58 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 14 Nov 2024 12:34:18 +0800 Subject: Correct include dir for libslang (#5539) This stops adding the repo root to the include path for anything linking with slang. This enabled a bunch of convenient includes, but might lead to confusing behavior for anyone including slang. Not to mention differences including it from an install vs source. Co-authored-by: Yong He --- tools/gfx/metal/metal-device.cpp | 2 +- tools/gfx/open-gl/render-gl.cpp | 2 +- tools/gfx/transient-resource-heap-base.h | 2 +- tools/gfx/vulkan/vk-device.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/gfx') diff --git a/tools/gfx/metal/metal-device.cpp b/tools/gfx/metal/metal-device.cpp index a536f64ff..623cd8a81 100644 --- a/tools/gfx/metal/metal-device.cpp +++ b/tools/gfx/metal/metal-device.cpp @@ -21,7 +21,7 @@ // #include "metal-pipeline-dump-layer.h" // #include "metal-helper-functions.h" -#include "source/core/slang-platform.h" +#include "core/slang-platform.h" namespace gfx { diff --git a/tools/gfx/open-gl/render-gl.cpp b/tools/gfx/open-gl/render-gl.cpp index 9af39f711..5bbee254d 100644 --- a/tools/gfx/open-gl/render-gl.cpp +++ b/tools/gfx/open-gl/render-gl.cpp @@ -7,7 +7,7 @@ #include "core/slang-basic.h" #include "core/slang-blob.h" #include "core/slang-secure-crt.h" -#include "external/stb/stb_image_write.h" +#include "stb_image_write.h" #if SLANG_WIN64 || SLANG_WIN64 #define ENABLE_GL_IMPL 1 diff --git a/tools/gfx/transient-resource-heap-base.h b/tools/gfx/transient-resource-heap-base.h index 9d7cb165a..d99d84697 100644 --- a/tools/gfx/transient-resource-heap-base.h +++ b/tools/gfx/transient-resource-heap-base.h @@ -1,5 +1,5 @@ +#include "core/slang-basic.h" #include "renderer-shared.h" -#include "source/core/slang-basic.h" namespace gfx { diff --git a/tools/gfx/vulkan/vk-device.cpp b/tools/gfx/vulkan/vk-device.cpp index 689213437..61edf53b9 100644 --- a/tools/gfx/vulkan/vk-device.cpp +++ b/tools/gfx/vulkan/vk-device.cpp @@ -1,7 +1,7 @@ // vk-device.cpp #include "vk-device.h" -#include "source/core/slang-platform.h" +#include "core/slang-platform.h" #include "vk-buffer.h" #include "vk-command-queue.h" #include "vk-fence.h" -- cgit v1.2.3