From 08c0018a66b66d4640fdea6fa32085f2f883bc9b Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 12 Nov 2024 16:27:55 +0800 Subject: [PATCH] Correct include dir for libslang 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. --- cmake/LLVM.cmake | 4 ++++ examples/CMakeLists.txt | 1 + examples/autodiff-texture/main.cpp | 6 +++--- examples/example-base/example-base.cpp | 2 +- examples/example-base/example-base.h | 6 +++--- examples/example-base/test-base.h | 2 +- examples/gpu-printing/main.cpp | 4 ++-- examples/hello-world/main.cpp | 2 +- examples/model-viewer/main.cpp | 10 +++++----- examples/nv-aftermath-example/main.cpp | 4 ++-- examples/platform-test/main.cpp | 2 +- examples/ray-tracing-pipeline/main.cpp | 6 +++--- examples/ray-tracing/main.cpp | 6 +++--- examples/shader-object/main.cpp | 2 +- examples/shader-toy/main.cpp | 8 ++++---- examples/triangle/main.cpp | 4 ++-- external/CMakeLists.txt | 6 +++++- source/slang-llvm/slang-llvm-filecheck.cpp | 2 +- source/slang/CMakeLists.txt | 7 +------ tools/CMakeLists.txt | 11 +++++++++-- tools/gfx-unit-test/buffer-barrier-test.cpp | 6 +++--- tools/gfx-unit-test/clear-texture-test.cpp | 6 +++--- tools/gfx-unit-test/compute-smoke.cpp | 6 +++--- tools/gfx-unit-test/compute-trivial.cpp | 6 +++--- tools/gfx-unit-test/copy-texture-tests.cpp | 6 +++--- tools/gfx-unit-test/create-buffer-from-handle.cpp | 6 +++--- .../gfx-unit-test/existing-device-handle-test.cpp | 6 +++--- tools/gfx-unit-test/format-unit-tests.cpp | 6 +++--- .../get-buffer-resource-handle-test.cpp | 6 +++--- tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp | 6 +++--- tools/gfx-unit-test/get-cmd-queue-handle-test.cpp | 6 +++--- .../get-supported-resource-states-test.cpp | 6 +++--- .../get-texture-resource-handle-test.cpp | 6 +++--- tools/gfx-unit-test/gfx-test-texture-util.cpp | 4 ++-- tools/gfx-unit-test/gfx-test-texture-util.h | 6 +++--- tools/gfx-unit-test/gfx-test-util.cpp | 2 +- tools/gfx-unit-test/gfx-test-util.h | 6 +++--- tools/gfx-unit-test/instanced-draw-tests.cpp | 6 +++--- tools/gfx-unit-test/link-time-constant.cpp | 8 ++++---- tools/gfx-unit-test/link-time-default.cpp | 8 ++++---- tools/gfx-unit-test/link-time-options.cpp | 8 ++++---- tools/gfx-unit-test/link-time-type.cpp | 8 ++++---- tools/gfx-unit-test/mutable-shader-object.cpp | 6 +++--- tools/gfx-unit-test/nested-parameter-block.cpp | 6 +++--- tools/gfx-unit-test/precompiled-module-2.cpp | 12 ++++++------ tools/gfx-unit-test/precompiled-module-cache.cpp | 12 ++++++------ tools/gfx-unit-test/precompiled-module.cpp | 10 +++++----- tools/gfx-unit-test/ray-tracing-tests.cpp | 8 ++++---- tools/gfx-unit-test/resolve-resource-tests.cpp | 6 +++--- tools/gfx-unit-test/root-mutable-shader-object.cpp | 6 +++--- tools/gfx-unit-test/root-shader-parameter.cpp | 6 +++--- tools/gfx-unit-test/sampler-array.cpp | 6 +++--- tools/gfx-unit-test/shader-cache-tests.cpp | 14 +++++++------- tools/gfx-unit-test/shared-buffers-tests.cpp | 6 +++--- tools/gfx-unit-test/shared-textures-tests.cpp | 6 +++--- tools/gfx-unit-test/swap-chain-resize-test.cpp | 8 ++++---- tools/gfx-unit-test/texture-types-tests.cpp | 6 +++--- tools/gfx-unit-test/uint16-structured-buffer.cpp | 6 +++--- 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 +- tools/platform/gui.h | 2 +- tools/platform/model.cpp | 4 ++-- tools/platform/window.h | 4 ++-- tools/render-test/png-serialize-util.cpp | 2 +- tools/render-test/shader-input-layout.h | 6 +++--- tools/slang-test/slang-test-main.cpp | 4 ++-- tools/slang-test/test-reporter.h | 2 +- tools/slang-unit-test/unit-test-byte-encode.cpp | 2 +- tools/slang-unit-test/unit-test-chunked-list.cpp | 6 +++--- .../unit-test-com-host-callable.cpp | 2 +- .../unit-test-command-line-args.cpp | 2 +- tools/slang-unit-test/unit-test-compression.cpp | 2 +- tools/slang-unit-test/unit-test-crypto.cpp | 2 +- .../unit-test-decl-tree-reflection.cpp | 2 +- .../unit-test-default-matrix-layout.cpp | 2 +- tools/slang-unit-test/unit-test-fcpw-compile.cpp | 2 +- tools/slang-unit-test/unit-test-file-system.cpp | 2 +- .../unit-test-find-check-entrypoint.cpp | 2 +- .../unit-test-find-entrypoint-nested.cpp | 2 +- .../unit-test-find-type-by-name.cpp | 2 +- tools/slang-unit-test/unit-test-free-list.cpp | 2 +- .../unit-test-function-reflection.cpp | 2 +- .../unit-test-generic-interface-conformance.cpp | 2 +- .../slang-unit-test/unit-test-get-target-code.cpp | 2 +- .../unit-test-image-format-reflection.cpp | 2 +- tools/slang-unit-test/unit-test-io.cpp | 2 +- tools/slang-unit-test/unit-test-json-native.cpp | 2 +- tools/slang-unit-test/unit-test-json.cpp | 2 +- tools/slang-unit-test/unit-test-lock-file.cpp | 2 +- tools/slang-unit-test/unit-test-memory-arena.cpp | 2 +- .../slang-unit-test/unit-test-offset-container.cpp | 2 +- .../unit-test-parameter-usage-reflection.cpp | 2 +- tools/slang-unit-test/unit-test-path.cpp | 2 +- .../slang-unit-test/unit-test-persistent-cache.cpp | 2 +- tools/slang-unit-test/unit-test-process.cpp | 2 +- tools/slang-unit-test/unit-test-record-replay.cpp | 2 +- tools/slang-unit-test/unit-test-riff.cpp | 2 +- tools/slang-unit-test/unit-test-rtti.cpp | 2 +- tools/slang-unit-test/unit-test-short-list.cpp | 4 ++-- tools/slang-unit-test/unit-test-source-map.cpp | 2 +- tools/slang-unit-test/unit-test-string-escape.cpp | 2 +- tools/slang-unit-test/unit-test-string.cpp | 2 +- .../unit-test-translation-unit-import.cpp | 2 +- tools/test-server/test-server-main.cpp | 2 +- tools/unit-test/slang-unit-test.cpp | 2 +- tools/unit-test/slang-unit-test.h | 2 +- 108 files changed, 240 insertions(+), 229 deletions(-) diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake index e0b7d6241c..3c7c1b5436 100644 --- a/cmake/LLVM.cmake +++ b/cmake/LLVM.cmake @@ -79,6 +79,10 @@ function(fetch_or_build_slang_llvm) LINK_WITH_PRIVATE core compiler-core llvm-dep clang-dep # We include slang.h, but don't need to link with it INCLUDE_FROM_PRIVATE slang + # We include tools/slang-test/filecheck.h, but don't need to link + # with it and it might not be a target if SLANG_ENABLE_TESTS is + # false, so just include the directory manually here + INCLUDE_DIRECTORIES_PRIVATE ${slang_SOURCE_DIR}/tools # This uses the SLANG_DLL_EXPORT macro from slang.h, so make sure to set # SLANG_DYNAMIC and SLANG_DYNAMIC_EXPORT EXPORT_MACRO_PREFIX SLANG diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index ad2d6f3194..960db6b395 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -64,6 +64,7 @@ if(SLANG_ENABLE_EXAMPLES) slang gfx platform + stb $<$:CUDA::cuda_driver> FOLDER examples ) diff --git a/examples/autodiff-texture/main.cpp b/examples/autodiff-texture/main.cpp index d09b7dbac2..647929e70e 100644 --- a/examples/autodiff-texture/main.cpp +++ b/examples/autodiff-texture/main.cpp @@ -1,11 +1,11 @@ +#include "core/slang-basic.h" #include "examples/example-base/example-base.h" #include "gfx-util/shader-cursor.h" +#include "platform/vector-math.h" +#include "platform/window.h" #include "slang-com-ptr.h" #include "slang-gfx.h" #include "slang.h" -#include "source/core/slang-basic.h" -#include "tools/platform/vector-math.h" -#include "tools/platform/window.h" using namespace gfx; using namespace Slang; diff --git a/examples/example-base/example-base.cpp b/examples/example-base/example-base.cpp index 9fee95dfec..9d5f1bcaed 100644 --- a/examples/example-base/example-base.cpp +++ b/examples/example-base/example-base.cpp @@ -7,7 +7,7 @@ #endif #define STB_IMAGE_IMPLEMENTATION -#include "external/stb/stb_image.h" +#include "stb_image.h" using namespace Slang; using namespace gfx; diff --git a/examples/example-base/example-base.h b/examples/example-base/example-base.h index c10231c149..0cb3de7e97 100644 --- a/examples/example-base/example-base.h +++ b/examples/example-base/example-base.h @@ -1,10 +1,10 @@ #pragma once +#include "core/slang-basic.h" +#include "core/slang-io.h" +#include "platform/window.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-io.h" #include "test-base.h" -#include "tools/platform/window.h" #ifdef _WIN32 void _Win32OutputDebugString(const char* str); diff --git a/examples/example-base/test-base.h b/examples/example-base/test-base.h index 3f600eae77..293c9f0d82 100644 --- a/examples/example-base/test-base.h +++ b/examples/example-base/test-base.h @@ -1,8 +1,8 @@ #pragma once +#include "core/slang-string-util.h" #include "slang-com-ptr.h" #include "slang.h" -#include "source/core/slang-string-util.h" using Slang::ComPtr; diff --git a/examples/gpu-printing/main.cpp b/examples/gpu-printing/main.cpp index fa9f919dc3..bbc300dba4 100644 --- a/examples/gpu-printing/main.cpp +++ b/examples/gpu-printing/main.cpp @@ -5,12 +5,12 @@ #include using Slang::ComPtr; +#include "core/slang-basic.h" #include "examples/example-base/example-base.h" #include "gfx-util/shader-cursor.h" #include "gpu-printing.h" +#include "platform/window.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/platform/window.h" using namespace gfx; diff --git a/examples/hello-world/main.cpp b/examples/hello-world/main.cpp index c6774b64f3..7e84d83e5c 100644 --- a/examples/hello-world/main.cpp +++ b/examples/hello-world/main.cpp @@ -7,11 +7,11 @@ // The goal is to demonstrate how to use the Slang API to cross compile // shader code. // +#include "core/slang-string-util.h" #include "examples/example-base/example-base.h" #include "examples/example-base/test-base.h" #include "slang-com-ptr.h" #include "slang.h" -#include "source/core/slang-string-util.h" #include "vulkan-api.h" using Slang::ComPtr; diff --git a/examples/model-viewer/main.cpp b/examples/model-viewer/main.cpp index 0b1167a110..8b75381be9 100644 --- a/examples/model-viewer/main.cpp +++ b/examples/model-viewer/main.cpp @@ -25,12 +25,12 @@ // and parameter binding. // #include "examples/example-base/example-base.h" +#include "gfx-util/shader-cursor.h" +#include "platform/gui.h" +#include "platform/model.h" +#include "platform/vector-math.h" +#include "platform/window.h" #include "slang-gfx.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/platform/gui.h" -#include "tools/platform/model.h" -#include "tools/platform/vector-math.h" -#include "tools/platform/window.h" #include #include diff --git a/examples/nv-aftermath-example/main.cpp b/examples/nv-aftermath-example/main.cpp index 67754a9117..9d85f1ff4f 100644 --- a/examples/nv-aftermath-example/main.cpp +++ b/examples/nv-aftermath-example/main.cpp @@ -3,13 +3,13 @@ #include "../../source/core/slang-io.h" #include "GFSDK_Aftermath.h" #include "GFSDK_Aftermath_GpuCrashDump.h" +#include "core/slang-basic.h" #include "examples/example-base/example-base.h" #include "gfx-util/shader-cursor.h" +#include "platform/window.h" #include "slang-com-ptr.h" #include "slang-gfx.h" #include "slang.h" -#include "source/core/slang-basic.h" -#include "tools/platform/window.h" using namespace gfx; using namespace Slang; diff --git a/examples/platform-test/main.cpp b/examples/platform-test/main.cpp index daa9bbc4b1..373c15e093 100644 --- a/examples/platform-test/main.cpp +++ b/examples/platform-test/main.cpp @@ -1,6 +1,6 @@ #include "examples/example-base/example-base.h" +#include "platform/window.h" #include "slang.h" -#include "tools/platform/window.h" using namespace gfx; using namespace Slang; diff --git a/examples/ray-tracing-pipeline/main.cpp b/examples/ray-tracing-pipeline/main.cpp index d32130c6a6..1e55c7eb13 100644 --- a/examples/ray-tracing-pipeline/main.cpp +++ b/examples/ray-tracing-pipeline/main.cpp @@ -3,14 +3,14 @@ // This file implements an example of hardware ray-tracing using // Slang shaders and the `gfx` graphics API. +#include "core/slang-basic.h" #include "examples/example-base/example-base.h" #include "gfx-util/shader-cursor.h" +#include "platform/vector-math.h" +#include "platform/window.h" #include "slang-com-ptr.h" #include "slang-gfx.h" #include "slang.h" -#include "source/core/slang-basic.h" -#include "tools/platform/vector-math.h" -#include "tools/platform/window.h" using namespace gfx; using namespace Slang; diff --git a/examples/ray-tracing/main.cpp b/examples/ray-tracing/main.cpp index aa1e426547..7878550f85 100644 --- a/examples/ray-tracing/main.cpp +++ b/examples/ray-tracing/main.cpp @@ -3,14 +3,14 @@ // This file implements an example of hardware ray-tracing using // Slang shaders and the `gfx` graphics API. +#include "core/slang-basic.h" #include "examples/example-base/example-base.h" #include "gfx-util/shader-cursor.h" +#include "platform/vector-math.h" +#include "platform/window.h" #include "slang-com-ptr.h" #include "slang-gfx.h" #include "slang.h" -#include "source/core/slang-basic.h" -#include "tools/platform/vector-math.h" -#include "tools/platform/window.h" using namespace gfx; using namespace Slang; diff --git a/examples/shader-object/main.cpp b/examples/shader-object/main.cpp index 74d81604b9..f5c02141f2 100644 --- a/examples/shader-object/main.cpp +++ b/examples/shader-object/main.cpp @@ -12,10 +12,10 @@ #include "slang.h" using Slang::ComPtr; +#include "core/slang-basic.h" #include "examples/example-base/example-base.h" #include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" using namespace gfx; diff --git a/examples/shader-toy/main.cpp b/examples/shader-toy/main.cpp index 38212099e4..1ab85c0b20 100644 --- a/examples/shader-toy/main.cpp +++ b/examples/shader-toy/main.cpp @@ -19,12 +19,12 @@ using Slang::ComPtr; // this layer is *not* required or assumed when using the Slang language, // compiler, and API. // +#include "core/slang-basic.h" #include "examples/example-base/example-base.h" +#include "gfx-util/shader-cursor.h" +#include "platform/performance-counter.h" +#include "platform/window.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/platform/performance-counter.h" -#include "tools/platform/window.h" #include diff --git a/examples/triangle/main.cpp b/examples/triangle/main.cpp index d5f929bf2d..e77f488cc8 100644 --- a/examples/triangle/main.cpp +++ b/examples/triangle/main.cpp @@ -32,12 +32,12 @@ // with Slang may depend on an application/engine making certain // design choices in their abstraction layer. // +#include "core/slang-basic.h" #include "examples/example-base/example-base.h" #include "gfx-util/shader-cursor.h" +#include "platform/window.h" #include "slang-com-ptr.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/platform/window.h" using namespace gfx; using namespace Slang; diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 091070e5df..43105a5f05 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -91,8 +91,12 @@ endif() add_library(imgui INTERFACE) target_include_directories(imgui INTERFACE "${CMAKE_CURRENT_LIST_DIR}/imgui") +# stb +add_library(stb INTERFACE) +target_include_directories(stb INTERFACE "${CMAKE_CURRENT_LIST_DIR}/stb") + +# slang-rhi if(SLANG_ENABLE_SLANG_RHI) - # slang-rhi set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$/bin) set(SLANG_RHI_SLANG_INCLUDE_DIR ${slang_SOURCE_DIR}/include) set(SLANG_RHI_SLANG_BINARY_DIR ${CMAKE_BINARY_DIR}) diff --git a/source/slang-llvm/slang-llvm-filecheck.cpp b/source/slang-llvm/slang-llvm-filecheck.cpp index c319a61c95..492b0e0d41 100644 --- a/source/slang-llvm/slang-llvm-filecheck.cpp +++ b/source/slang-llvm/slang-llvm-filecheck.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include namespace slang_llvm { diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index fc815f84cd..4dfbed4097 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -205,12 +205,7 @@ set(slang_link_args slang-lookup-tables SPIRV-Headers ) -set(slang_interface_args - # slang.h is in the project root, so include that directory in the interface - # for slang - INCLUDE_DIRECTORIES_PUBLIC - ${slang_SOURCE_DIR} -) +set(slang_interface_args INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/include) set(slang_public_lib_args PUBLIC_HEADERS ${slang_SOURCE_DIR}/include/slang*.h diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 2593a60fd5..8438fe6b84 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -98,6 +98,7 @@ if(SLANG_ENABLE_GFX) LINK_WITH_PRIVATE core imgui + stb $<$:X11::X11> "$<$:-framework Cocoa>" "$<$:-framework QuartzCore>" @@ -106,7 +107,7 @@ if(SLANG_ENABLE_GFX) EXTRA_COMPILE_DEFINITIONS_PRIVATE $<$:SLANG_ENABLE_XLIB=1> INCLUDE_FROM_PRIVATE gfx - INCLUDE_DIRECTORIES_PUBLIC platform + INCLUDE_DIRECTORIES_PUBLIC . platform EXPORT_MACRO_PREFIX SLANG_PLATFORM ) @@ -122,6 +123,7 @@ if(SLANG_ENABLE_GFX) slang Vulkan-Headers metal-cpp + stb $<$:X11::X11> $<$:CUDA::cuda_driver> LINK_WITH_FRAMEWORK Foundation Cocoa QuartzCore Metal @@ -182,6 +184,7 @@ if(SLANG_ENABLE_TESTS) EXECUTABLE EXCLUDE_FROM_ALL LINK_WITH_PRIVATE core compiler-core slang + INCLUDE_FROM_PRIVATE unit-test FOLDER test ) slang_add_target( @@ -196,10 +199,12 @@ if(SLANG_ENABLE_TESTS) slang-test EXECUTABLE USE_FEWER_WARNINGS + INCLUDE_DIRECTORIES_PUBLIC . LINK_WITH_PRIVATE core compiler-core slang + stb ${CMAKE_DL_LIBS} Threads::Threads REQUIRES @@ -241,6 +246,7 @@ if(SLANG_ENABLE_TESTS) unit-test OBJECT EXCLUDE_FROM_ALL + INCLUDE_DIRECTORIES_PUBLIC . INCLUDE_FROM_PRIVATE slang core INCLUDE_DIRECTORIES_PRIVATE ${slang_SOURCE_DIR}/include FOLDER test @@ -254,7 +260,7 @@ if(SLANG_ENABLE_TESTS) EXCLUDE_FROM_ALL EXTRA_COMPILE_DEFINITIONS_PRIVATE SLANG_SHARED_LIBRARY_TOOL USE_FEWER_WARNINGS - LINK_WITH_PRIVATE core slang unit-test gfx gfx-util platform + LINK_WITH_PRIVATE core slang unit-test gfx gfx-util platform stb OUTPUT_NAME gfx-unit-test-tool REQUIRED_BY slang-test FOLDER test/tools @@ -272,6 +278,7 @@ if(SLANG_ENABLE_TESTS) slang slang-rhi platform + stb $<$:CUDA::cuda_driver> EXTRA_COMPILE_DEFINITIONS_PRIVATE $<$:RENDER_TEST_CUDA> diff --git a/tools/gfx-unit-test/buffer-barrier-test.cpp b/tools/gfx-unit-test/buffer-barrier-test.cpp index 2ee78fdb11..2d53ac13f9 100644 --- a/tools/gfx-unit-test/buffer-barrier-test.cpp +++ b/tools/gfx-unit-test/buffer-barrier-test.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/clear-texture-test.cpp b/tools/gfx-unit-test/clear-texture-test.cpp index ed9d12f0d7..3e1efae0a2 100644 --- a/tools/gfx-unit-test/clear-texture-test.cpp +++ b/tools/gfx-unit-test/clear-texture-test.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; using namespace gfx; diff --git a/tools/gfx-unit-test/compute-smoke.cpp b/tools/gfx-unit-test/compute-smoke.cpp index da83575914..ba1da22834 100644 --- a/tools/gfx-unit-test/compute-smoke.cpp +++ b/tools/gfx-unit-test/compute-smoke.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/compute-trivial.cpp b/tools/gfx-unit-test/compute-trivial.cpp index 341593d042..c897482298 100644 --- a/tools/gfx-unit-test/compute-trivial.cpp +++ b/tools/gfx-unit-test/compute-trivial.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/copy-texture-tests.cpp b/tools/gfx-unit-test/copy-texture-tests.cpp index babe0bcf1c..f6f85f9f42 100644 --- a/tools/gfx-unit-test/copy-texture-tests.cpp +++ b/tools/gfx-unit-test/copy-texture-tests.cpp @@ -1,9 +1,9 @@ +#include "core/slang-basic.h" #include "gfx-test-texture-util.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include diff --git a/tools/gfx-unit-test/create-buffer-from-handle.cpp b/tools/gfx-unit-test/create-buffer-from-handle.cpp index a4e743196c..f25aa5d5f0 100644 --- a/tools/gfx-unit-test/create-buffer-from-handle.cpp +++ b/tools/gfx-unit-test/create-buffer-from-handle.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/existing-device-handle-test.cpp b/tools/gfx-unit-test/existing-device-handle-test.cpp index e971100b9c..8b7a84ec24 100644 --- a/tools/gfx-unit-test/existing-device-handle-test.cpp +++ b/tools/gfx-unit-test/existing-device-handle-test.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/format-unit-tests.cpp b/tools/gfx-unit-test/format-unit-tests.cpp index 3b7695ccc0..56741854eb 100644 --- a/tools/gfx-unit-test/format-unit-tests.cpp +++ b/tools/gfx-unit-test/format-unit-tests.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp b/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp index 83c3f400d5..97bb413fda 100644 --- a/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp +++ b/tools/gfx-unit-test/get-buffer-resource-handle-test.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include diff --git a/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp b/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp index c916c0d6d0..b1e7ebc04e 100644 --- a/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp +++ b/tools/gfx-unit-test/get-cmd-buffer-handle-test.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include diff --git a/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp b/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp index f8b3850a11..5e72c41d96 100644 --- a/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp +++ b/tools/gfx-unit-test/get-cmd-queue-handle-test.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include diff --git a/tools/gfx-unit-test/get-supported-resource-states-test.cpp b/tools/gfx-unit-test/get-supported-resource-states-test.cpp index 9870dfa1f3..844372eaa2 100644 --- a/tools/gfx-unit-test/get-supported-resource-states-test.cpp +++ b/tools/gfx-unit-test/get-supported-resource-states-test.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include diff --git a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp index 2cd2ba6584..4a7412ddc3 100644 --- a/tools/gfx-unit-test/get-texture-resource-handle-test.cpp +++ b/tools/gfx-unit-test/get-texture-resource-handle-test.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include diff --git a/tools/gfx-unit-test/gfx-test-texture-util.cpp b/tools/gfx-unit-test/gfx-test-texture-util.cpp index bb2c9c5eb0..7e6d738ee5 100644 --- a/tools/gfx-unit-test/gfx-test-texture-util.cpp +++ b/tools/gfx-unit-test/gfx-test-texture-util.cpp @@ -2,7 +2,7 @@ #include "gfx-test-util.h" #include "slang-com-ptr.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include @@ -12,7 +12,7 @@ #pragma warning(disable : 4996) #endif #define STB_IMAGE_WRITE_IMPLEMENTATION -#include "external/stb/stb_image_write.h" +#include "stb_image_write.h" #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/tools/gfx-unit-test/gfx-test-texture-util.h b/tools/gfx-unit-test/gfx-test-texture-util.h index 2751a2a202..6a98eec437 100644 --- a/tools/gfx-unit-test/gfx-test-texture-util.h +++ b/tools/gfx-unit-test/gfx-test-texture-util.h @@ -1,9 +1,9 @@ #pragma once +#include "core/slang-basic.h" +#include "core/slang-render-api-util.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-render-api-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; using namespace gfx; diff --git a/tools/gfx-unit-test/gfx-test-util.cpp b/tools/gfx-unit-test/gfx-test-util.cpp index 79343680fa..2bbe654160 100644 --- a/tools/gfx-unit-test/gfx-test-util.cpp +++ b/tools/gfx-unit-test/gfx-test-util.cpp @@ -1,7 +1,7 @@ #include "gfx-test-util.h" #include "slang-com-ptr.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #define GFX_ENABLE_RENDERDOC_INTEGRATION 0 #define GFX_ENABLE_SPIRV_DEBUG 0 diff --git a/tools/gfx-unit-test/gfx-test-util.h b/tools/gfx-unit-test/gfx-test-util.h index 51b1feb1fa..5586701621 100644 --- a/tools/gfx-unit-test/gfx-test-util.h +++ b/tools/gfx-unit-test/gfx-test-util.h @@ -1,9 +1,9 @@ #pragma once +#include "core/slang-basic.h" +#include "core/slang-render-api-util.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-render-api-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" namespace gfx_test { diff --git a/tools/gfx-unit-test/instanced-draw-tests.cpp b/tools/gfx-unit-test/instanced-draw-tests.cpp index adb1a1df16..636a4e2e44 100644 --- a/tools/gfx-unit-test/instanced-draw-tests.cpp +++ b/tools/gfx-unit-test/instanced-draw-tests.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/link-time-constant.cpp b/tools/gfx-unit-test/link-time-constant.cpp index 047ecd3bcc..47dbbab2dc 100644 --- a/tools/gfx-unit-test/link-time-constant.cpp +++ b/tools/gfx-unit-test/link-time-constant.cpp @@ -1,9 +1,9 @@ +#include "core/slang-basic.h" +#include "core/slang-blob.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-blob.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/link-time-default.cpp b/tools/gfx-unit-test/link-time-default.cpp index d341e5dc05..244991148d 100644 --- a/tools/gfx-unit-test/link-time-default.cpp +++ b/tools/gfx-unit-test/link-time-default.cpp @@ -1,9 +1,9 @@ +#include "core/slang-basic.h" +#include "core/slang-blob.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-blob.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/link-time-options.cpp b/tools/gfx-unit-test/link-time-options.cpp index 590db576e2..64f189162d 100644 --- a/tools/gfx-unit-test/link-time-options.cpp +++ b/tools/gfx-unit-test/link-time-options.cpp @@ -1,9 +1,9 @@ +#include "core/slang-basic.h" +#include "core/slang-blob.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-blob.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/link-time-type.cpp b/tools/gfx-unit-test/link-time-type.cpp index 81c7381264..8f4bcca01c 100644 --- a/tools/gfx-unit-test/link-time-type.cpp +++ b/tools/gfx-unit-test/link-time-type.cpp @@ -1,9 +1,9 @@ +#include "core/slang-basic.h" +#include "core/slang-blob.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-blob.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/mutable-shader-object.cpp b/tools/gfx-unit-test/mutable-shader-object.cpp index 9c91a7ca30..c7ce40d34b 100644 --- a/tools/gfx-unit-test/mutable-shader-object.cpp +++ b/tools/gfx-unit-test/mutable-shader-object.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/nested-parameter-block.cpp b/tools/gfx-unit-test/nested-parameter-block.cpp index e904226aeb..1201be2610 100644 --- a/tools/gfx-unit-test/nested-parameter-block.cpp +++ b/tools/gfx-unit-test/nested-parameter-block.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; namespace gfx_test diff --git a/tools/gfx-unit-test/precompiled-module-2.cpp b/tools/gfx-unit-test/precompiled-module-2.cpp index f5c478b4d1..f5d576a232 100644 --- a/tools/gfx-unit-test/precompiled-module-2.cpp +++ b/tools/gfx-unit-test/precompiled-module-2.cpp @@ -1,11 +1,11 @@ +#include "core/slang-basic.h" +#include "core/slang-blob.h" +#include "core/slang-io.h" +#include "core/slang-memory-file-system.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-blob.h" -#include "source/core/slang-io.h" -#include "source/core/slang-memory-file-system.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/precompiled-module-cache.cpp b/tools/gfx-unit-test/precompiled-module-cache.cpp index 1c10f759ba..8c22a7c84f 100644 --- a/tools/gfx-unit-test/precompiled-module-cache.cpp +++ b/tools/gfx-unit-test/precompiled-module-cache.cpp @@ -1,11 +1,11 @@ +#include "core/slang-basic.h" +#include "core/slang-blob.h" +#include "core/slang-io.h" +#include "core/slang-memory-file-system.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-blob.h" -#include "source/core/slang-io.h" -#include "source/core/slang-memory-file-system.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/precompiled-module.cpp b/tools/gfx-unit-test/precompiled-module.cpp index 2ecc412c48..3d5e5e5653 100644 --- a/tools/gfx-unit-test/precompiled-module.cpp +++ b/tools/gfx-unit-test/precompiled-module.cpp @@ -1,10 +1,10 @@ +#include "core/slang-basic.h" +#include "core/slang-blob.h" +#include "core/slang-memory-file-system.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-blob.h" -#include "source/core/slang-memory-file-system.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/ray-tracing-tests.cpp b/tools/gfx-unit-test/ray-tracing-tests.cpp index 0e7fd2765a..1506128adb 100644 --- a/tools/gfx-unit-test/ray-tracing-tests.cpp +++ b/tools/gfx-unit-test/ray-tracing-tests.cpp @@ -1,10 +1,10 @@ +#include "core/slang-basic.h" #include "gfx-test-texture-util.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" +#include "platform/vector-math.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/platform/vector-math.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include diff --git a/tools/gfx-unit-test/resolve-resource-tests.cpp b/tools/gfx-unit-test/resolve-resource-tests.cpp index ea25b609f3..dd318c7c4f 100644 --- a/tools/gfx-unit-test/resolve-resource-tests.cpp +++ b/tools/gfx-unit-test/resolve-resource-tests.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include diff --git a/tools/gfx-unit-test/root-mutable-shader-object.cpp b/tools/gfx-unit-test/root-mutable-shader-object.cpp index fce4cc0da7..c3bd953827 100644 --- a/tools/gfx-unit-test/root-mutable-shader-object.cpp +++ b/tools/gfx-unit-test/root-mutable-shader-object.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/root-shader-parameter.cpp b/tools/gfx-unit-test/root-shader-parameter.cpp index f933ec48a8..a06a07ef57 100644 --- a/tools/gfx-unit-test/root-shader-parameter.cpp +++ b/tools/gfx-unit-test/root-shader-parameter.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/sampler-array.cpp b/tools/gfx-unit-test/sampler-array.cpp index 720aa0a2cc..67efe0c32a 100644 --- a/tools/gfx-unit-test/sampler-array.cpp +++ b/tools/gfx-unit-test/sampler-array.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/shader-cache-tests.cpp b/tools/gfx-unit-test/shader-cache-tests.cpp index 8ee8d90151..69767b3d23 100644 --- a/tools/gfx-unit-test/shader-cache-tests.cpp +++ b/tools/gfx-unit-test/shader-cache-tests.cpp @@ -1,13 +1,13 @@ +#include "core/slang-basic.h" +#include "core/slang-file-system.h" +#include "core/slang-io.h" +#include "core/slang-process.h" +#include "core/slang-string-util.h" #include "gfx-test-texture-util.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-file-system.h" -#include "source/core/slang-io.h" -#include "source/core/slang-process.h" -#include "source/core/slang-string-util.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; using namespace Slang; diff --git a/tools/gfx-unit-test/shared-buffers-tests.cpp b/tools/gfx-unit-test/shared-buffers-tests.cpp index 4355dda99b..dbb0be3bed 100644 --- a/tools/gfx-unit-test/shared-buffers-tests.cpp +++ b/tools/gfx-unit-test/shared-buffers-tests.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/shared-textures-tests.cpp b/tools/gfx-unit-test/shared-textures-tests.cpp index ee8108c39b..f017c959e7 100644 --- a/tools/gfx-unit-test/shared-textures-tests.cpp +++ b/tools/gfx-unit-test/shared-textures-tests.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx-unit-test/swap-chain-resize-test.cpp b/tools/gfx-unit-test/swap-chain-resize-test.cpp index 269f087352..23f39fd8a2 100644 --- a/tools/gfx-unit-test/swap-chain-resize-test.cpp +++ b/tools/gfx-unit-test/swap-chain-resize-test.cpp @@ -1,9 +1,9 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" +#include "platform/window.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/platform/window.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; using namespace Slang; diff --git a/tools/gfx-unit-test/texture-types-tests.cpp b/tools/gfx-unit-test/texture-types-tests.cpp index 89342f9cf7..b581fd3d7d 100644 --- a/tools/gfx-unit-test/texture-types-tests.cpp +++ b/tools/gfx-unit-test/texture-types-tests.cpp @@ -1,9 +1,9 @@ +#include "core/slang-basic.h" #include "gfx-test-texture-util.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #if SLANG_WINDOWS_FAMILY #include diff --git a/tools/gfx-unit-test/uint16-structured-buffer.cpp b/tools/gfx-unit-test/uint16-structured-buffer.cpp index 23fd705446..d0d1789ede 100644 --- a/tools/gfx-unit-test/uint16-structured-buffer.cpp +++ b/tools/gfx-unit-test/uint16-structured-buffer.cpp @@ -1,8 +1,8 @@ +#include "core/slang-basic.h" #include "gfx-test-util.h" +#include "gfx-util/shader-cursor.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" -#include "tools/gfx-util/shader-cursor.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace gfx; diff --git a/tools/gfx/metal/metal-device.cpp b/tools/gfx/metal/metal-device.cpp index a536f64ffe..623cd8a81b 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 9af39f7117..5bbee254dc 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 9d7cb165ab..d99d84697d 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 6892134372..61edf53b91 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" diff --git a/tools/platform/gui.h b/tools/platform/gui.h index 82193cb864..eea9aa4f0a 100644 --- a/tools/platform/gui.h +++ b/tools/platform/gui.h @@ -1,10 +1,10 @@ // gui.h #pragma once +#include "core/slang-basic.h" #include "external/imgui/imgui.h" #include "slang-com-ptr.h" #include "slang-gfx.h" -#include "source/core/slang-basic.h" #include "vector-math.h" #include "window.h" diff --git a/tools/platform/model.cpp b/tools/platform/model.cpp index 8531f78442..18a7ad641f 100644 --- a/tools/platform/model.cpp +++ b/tools/platform/model.cpp @@ -7,13 +7,13 @@ #include "../../external/tinyobjloader/tiny_obj_loader.h" #define STB_IMAGE_IMPLEMENTATION -#include "../../external/stb/stb_image.h" +#include "stb_image.h" #define STB_IMAGE_RESIZE_IMPLEMENTATION #include "../../external/glm/glm/glm.hpp" #include "../../external/glm/glm/gtc/constants.hpp" #include "../../external/glm/glm/gtc/matrix_transform.hpp" -#include "../../external/stb/stb_image_resize.h" +#include "stb_image_resize.h" #include #include diff --git a/tools/platform/window.h b/tools/platform/window.h index a419f85b91..4ff9e245f6 100644 --- a/tools/platform/window.h +++ b/tools/platform/window.h @@ -1,10 +1,10 @@ // window.h #pragma once +#include "core/slang-basic.h" +#include "core/slang-func-ptr.h" #include "platform-api.h" #include "slang-com-ptr.h" -#include "source/core/slang-basic.h" -#include "source/core/slang-func-ptr.h" namespace platform { diff --git a/tools/render-test/png-serialize-util.cpp b/tools/render-test/png-serialize-util.cpp index 8a649ee873..15aaba00b6 100644 --- a/tools/render-test/png-serialize-util.cpp +++ b/tools/render-test/png-serialize-util.cpp @@ -7,7 +7,7 @@ #include #define STB_IMAGE_WRITE_IMPLEMENTATION -#include "external/stb/stb_image_write.h" +#include "stb_image_write.h" namespace renderer_test { diff --git a/tools/render-test/shader-input-layout.h b/tools/render-test/shader-input-layout.h index 032e6019d5..187cc0b840 100644 --- a/tools/render-test/shader-input-layout.h +++ b/tools/render-test/shader-input-layout.h @@ -1,9 +1,9 @@ #ifndef SLANG_TEST_SHADER_INPUT_LAYOUT_H #define SLANG_TEST_SHADER_INPUT_LAYOUT_H -#include "source/core/slang-basic.h" -#include "source/core/slang-random-generator.h" -#include "source/core/slang-writer.h" +#include "core/slang-basic.h" +#include "core/slang-random-generator.h" +#include "core/slang-writer.h" #include diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index bdc7a082b0..ae6eb62164 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -17,7 +17,7 @@ #include "../../source/core/slang-token-reader.h" #include "../../source/core/slang-type-text-util.h" #include "slang-com-helper.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #undef SLANG_UNIT_TEST #include "../../source/compiler-core/slang-artifact-associated-impl.h" @@ -32,7 +32,7 @@ #include "test-reporter.h" #define STB_IMAGE_IMPLEMENTATION -#include "external/stb/stb_image.h" +#include "stb_image.h" #include #include diff --git a/tools/slang-test/test-reporter.h b/tools/slang-test/test-reporter.h index 8e7b73c672..bf95803b5d 100644 --- a/tools/slang-test/test-reporter.h +++ b/tools/slang-test/test-reporter.h @@ -7,7 +7,7 @@ #include "../../source/core/slang-platform.h" #include "../../source/core/slang-std-writers.h" #include "../../source/core/slang-string-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include diff --git a/tools/slang-unit-test/unit-test-byte-encode.cpp b/tools/slang-unit-test/unit-test-byte-encode.cpp index 633d3918d5..08ab3d34f6 100644 --- a/tools/slang-unit-test/unit-test-byte-encode.cpp +++ b/tools/slang-unit-test/unit-test-byte-encode.cpp @@ -3,7 +3,7 @@ #include "../../source/core/slang-byte-encode-util.h" #include "../../source/core/slang-list.h" #include "../../source/core/slang-random-generator.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-chunked-list.cpp b/tools/slang-unit-test/unit-test-chunked-list.cpp index af4f597b21..726254fc79 100644 --- a/tools/slang-unit-test/unit-test-chunked-list.cpp +++ b/tools/slang-unit-test/unit-test-chunked-list.cpp @@ -1,8 +1,8 @@ // unit-test-path.cpp -#include "source/core/slang-basic.h" -#include "source/core/slang-chunked-list.h" -#include "tools/unit-test/slang-unit-test.h" +#include "core/slang-basic.h" +#include "core/slang-chunked-list.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-com-host-callable.cpp b/tools/slang-unit-test/unit-test-com-host-callable.cpp index 7fcc033b4e..3d37247b7f 100644 --- a/tools/slang-unit-test/unit-test-com-host-callable.cpp +++ b/tools/slang-unit-test/unit-test-com-host-callable.cpp @@ -5,7 +5,7 @@ #include "slang-com-helper.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-command-line-args.cpp b/tools/slang-unit-test/unit-test-command-line-args.cpp index febbeaddb5..52e4226ebc 100644 --- a/tools/slang-unit-test/unit-test-command-line-args.cpp +++ b/tools/slang-unit-test/unit-test-command-line-args.cpp @@ -1,7 +1,7 @@ // unit-test-command-line-args.cpp #include "../../source/compiler-core/slang-command-line-args.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-compression.cpp b/tools/slang-unit-test/unit-test-compression.cpp index 3b0ba33613..8274d34108 100644 --- a/tools/slang-unit-test/unit-test-compression.cpp +++ b/tools/slang-unit-test/unit-test-compression.cpp @@ -1,7 +1,7 @@ // unit-compression.cpp #include "../../source/core/slang-deflate-compression-system.h" #include "../../source/core/slang-lz4-compression-system.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-crypto.cpp b/tools/slang-unit-test/unit-test-crypto.cpp index 244f7135b8..5899f22c54 100644 --- a/tools/slang-unit-test/unit-test-crypto.cpp +++ b/tools/slang-unit-test/unit-test-crypto.cpp @@ -1,6 +1,6 @@ // unit-test-sha1.cpp #include "../../source/core/slang-crypto.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-decl-tree-reflection.cpp b/tools/slang-unit-test/unit-test-decl-tree-reflection.cpp index cbe0eb80b9..c8bd9cd027 100644 --- a/tools/slang-unit-test/unit-test-decl-tree-reflection.cpp +++ b/tools/slang-unit-test/unit-test-decl-tree-reflection.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-default-matrix-layout.cpp b/tools/slang-unit-test/unit-test-default-matrix-layout.cpp index 406432321e..e495c99835 100644 --- a/tools/slang-unit-test/unit-test-default-matrix-layout.cpp +++ b/tools/slang-unit-test/unit-test-default-matrix-layout.cpp @@ -4,7 +4,7 @@ #include "slang-com-helper.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-fcpw-compile.cpp b/tools/slang-unit-test/unit-test-fcpw-compile.cpp index e36052b657..7ed1c8e1a2 100644 --- a/tools/slang-unit-test/unit-test-fcpw-compile.cpp +++ b/tools/slang-unit-test/unit-test-fcpw-compile.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-file-system.cpp b/tools/slang-unit-test/unit-test-file-system.cpp index 2a724fb3ce..676ef5ee18 100644 --- a/tools/slang-unit-test/unit-test-file-system.cpp +++ b/tools/slang-unit-test/unit-test-file-system.cpp @@ -8,7 +8,7 @@ #include "../../source/core/slang-memory-file-system.h" #include "../../source/core/slang-riff-file-system.h" #include "../../source/core/slang-zip-file-system.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp b/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp index 717b937d13..8ecab9671c 100644 --- a/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp +++ b/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-find-entrypoint-nested.cpp b/tools/slang-unit-test/unit-test-find-entrypoint-nested.cpp index 6cf2ffd17e..dfd26e699b 100644 --- a/tools/slang-unit-test/unit-test-find-entrypoint-nested.cpp +++ b/tools/slang-unit-test/unit-test-find-entrypoint-nested.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-find-type-by-name.cpp b/tools/slang-unit-test/unit-test-find-type-by-name.cpp index a42b08adee..2c423fb25c 100644 --- a/tools/slang-unit-test/unit-test-find-type-by-name.cpp +++ b/tools/slang-unit-test/unit-test-find-type-by-name.cpp @@ -1,7 +1,7 @@ // unit-test-find-type-by-name.cpp #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-free-list.cpp b/tools/slang-unit-test/unit-test-free-list.cpp index 80cd01dc12..7e26bb31e2 100644 --- a/tools/slang-unit-test/unit-test-free-list.cpp +++ b/tools/slang-unit-test/unit-test-free-list.cpp @@ -3,7 +3,7 @@ #include "../../source/core/slang-free-list.h" #include "../../source/core/slang-list.h" #include "../../source/core/slang-random-generator.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-function-reflection.cpp b/tools/slang-unit-test/unit-test-function-reflection.cpp index 2d62bd761c..52c2e795a3 100644 --- a/tools/slang-unit-test/unit-test-function-reflection.cpp +++ b/tools/slang-unit-test/unit-test-function-reflection.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-generic-interface-conformance.cpp b/tools/slang-unit-test/unit-test-generic-interface-conformance.cpp index df5e6e63ad..717e5a0692 100644 --- a/tools/slang-unit-test/unit-test-generic-interface-conformance.cpp +++ b/tools/slang-unit-test/unit-test-generic-interface-conformance.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-get-target-code.cpp b/tools/slang-unit-test/unit-test-get-target-code.cpp index f3df15b64a..6a9f6ca279 100644 --- a/tools/slang-unit-test/unit-test-get-target-code.cpp +++ b/tools/slang-unit-test/unit-test-get-target-code.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-image-format-reflection.cpp b/tools/slang-unit-test/unit-test-image-format-reflection.cpp index 66d18b3e0c..2d86dbaa82 100644 --- a/tools/slang-unit-test/unit-test-image-format-reflection.cpp +++ b/tools/slang-unit-test/unit-test-image-format-reflection.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-io.cpp b/tools/slang-unit-test/unit-test-io.cpp index 0e6cab94d6..568a8c58f1 100644 --- a/tools/slang-unit-test/unit-test-io.cpp +++ b/tools/slang-unit-test/unit-test-io.cpp @@ -1,7 +1,7 @@ // unit-test-io.cpp #include "../../source/core/slang-io.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-json-native.cpp b/tools/slang-unit-test/unit-test-json-native.cpp index de5b7cfa44..ba04e8e5c3 100644 --- a/tools/slang-unit-test/unit-test-json-native.cpp +++ b/tools/slang-unit-test/unit-test-json-native.cpp @@ -3,7 +3,7 @@ #include "../../source/compiler-core/slang-json-native.h" #include "../../source/compiler-core/slang-json-parser.h" #include "../../source/core/slang-rtti-info.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-json.cpp b/tools/slang-unit-test/unit-test-json.cpp index 5327770300..5f3e7ed56d 100644 --- a/tools/slang-unit-test/unit-test-json.cpp +++ b/tools/slang-unit-test/unit-test-json.cpp @@ -3,7 +3,7 @@ #include "../../source/compiler-core/slang-json-parser.h" #include "../../source/compiler-core/slang-json-value.h" #include "../../source/core/slang-string-escape-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-lock-file.cpp b/tools/slang-unit-test/unit-test-lock-file.cpp index 5ef9fa0360..6458d4b5f0 100644 --- a/tools/slang-unit-test/unit-test-lock-file.cpp +++ b/tools/slang-unit-test/unit-test-lock-file.cpp @@ -1,7 +1,7 @@ // unit-test-lock-file.cpp #include "../../source/core/slang-io.h" #include "../../source/core/slang-process.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-memory-arena.cpp b/tools/slang-unit-test/unit-test-memory-arena.cpp index 3ceca8410c..c8ab988272 100644 --- a/tools/slang-unit-test/unit-test-memory-arena.cpp +++ b/tools/slang-unit-test/unit-test-memory-arena.cpp @@ -3,7 +3,7 @@ #include "../../source/core/slang-list.h" #include "../../source/core/slang-memory-arena.h" #include "../../source/core/slang-random-generator.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-offset-container.cpp b/tools/slang-unit-test/unit-test-offset-container.cpp index 90f1872821..57de42bc25 100644 --- a/tools/slang-unit-test/unit-test-offset-container.cpp +++ b/tools/slang-unit-test/unit-test-offset-container.cpp @@ -1,7 +1,7 @@ // unit-test-offset-container.cpp #include "../../source/core/slang-offset-container.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-parameter-usage-reflection.cpp b/tools/slang-unit-test/unit-test-parameter-usage-reflection.cpp index c437ae2a25..ce9df5a421 100644 --- a/tools/slang-unit-test/unit-test-parameter-usage-reflection.cpp +++ b/tools/slang-unit-test/unit-test-parameter-usage-reflection.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-path.cpp b/tools/slang-unit-test/unit-test-path.cpp index d96acd4f75..c94950bd43 100644 --- a/tools/slang-unit-test/unit-test-path.cpp +++ b/tools/slang-unit-test/unit-test-path.cpp @@ -1,7 +1,7 @@ // unit-test-path.cpp #include "../../source/core/slang-io.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-persistent-cache.cpp b/tools/slang-unit-test/unit-test-persistent-cache.cpp index fa5d286f24..95c52c596a 100644 --- a/tools/slang-unit-test/unit-test-persistent-cache.cpp +++ b/tools/slang-unit-test/unit-test-persistent-cache.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-persistent-cache.h" #include "../../source/core/slang-process.h" #include "../../source/core/slang-random-generator.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-process.cpp b/tools/slang-unit-test/unit-test-process.cpp index 8866f4a9e2..99102fa520 100644 --- a/tools/slang-unit-test/unit-test-process.cpp +++ b/tools/slang-unit-test/unit-test-process.cpp @@ -5,7 +5,7 @@ #include "../../source/core/slang-process-util.h" #include "../../source/core/slang-random-generator.h" #include "../../source/core/slang-string-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-record-replay.cpp b/tools/slang-unit-test/unit-test-record-replay.cpp index b81304937a..b6ed99aa5b 100644 --- a/tools/slang-unit-test/unit-test-record-replay.cpp +++ b/tools/slang-unit-test/unit-test-record-replay.cpp @@ -5,7 +5,7 @@ #include "../../source/core/slang-process-util.h" #include "../../source/core/slang-random-generator.h" #include "../../source/core/slang-string-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/slang-unit-test/unit-test-riff.cpp b/tools/slang-unit-test/unit-test-riff.cpp index a0eb91a476..5f8b448f94 100644 --- a/tools/slang-unit-test/unit-test-riff.cpp +++ b/tools/slang-unit-test/unit-test-riff.cpp @@ -2,7 +2,7 @@ #include "../../source/core/slang-random-generator.h" #include "../../source/core/slang-riff.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-rtti.cpp b/tools/slang-unit-test/unit-test-rtti.cpp index 485d58aea9..d1a628ed35 100644 --- a/tools/slang-unit-test/unit-test-rtti.cpp +++ b/tools/slang-unit-test/unit-test-rtti.cpp @@ -1,7 +1,7 @@ // unit-test-rtti.cpp #include "../../source/core/slang-rtti-info.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-short-list.cpp b/tools/slang-unit-test/unit-test-short-list.cpp index 9d5de9328e..e2dfb4dc03 100644 --- a/tools/slang-unit-test/unit-test-short-list.cpp +++ b/tools/slang-unit-test/unit-test-short-list.cpp @@ -1,7 +1,7 @@ // unit-test-path.cpp -#include "source/core/slang-basic.h" -#include "tools/unit-test/slang-unit-test.h" +#include "core/slang-basic.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-source-map.cpp b/tools/slang-unit-test/unit-test-source-map.cpp index 797229afe2..4435517cf9 100644 --- a/tools/slang-unit-test/unit-test-source-map.cpp +++ b/tools/slang-unit-test/unit-test-source-map.cpp @@ -7,7 +7,7 @@ #include "../../source/compiler-core/slang-source-map.h" #include "../../source/core/slang-rtti-info.h" #include "../../source/core/slang-string-escape-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-string-escape.cpp b/tools/slang-unit-test/unit-test-string-escape.cpp index 3a1cb7f065..676847290f 100644 --- a/tools/slang-unit-test/unit-test-string-escape.cpp +++ b/tools/slang-unit-test/unit-test-string-escape.cpp @@ -1,7 +1,7 @@ // unit-test-string-escape.cpp #include "../../source/core/slang-string-escape-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" using namespace Slang; diff --git a/tools/slang-unit-test/unit-test-string.cpp b/tools/slang-unit-test/unit-test-string.cpp index 4a71bca4bf..93ef83a77e 100644 --- a/tools/slang-unit-test/unit-test-string.cpp +++ b/tools/slang-unit-test/unit-test-string.cpp @@ -1,7 +1,7 @@ // unit-test-path.cpp #include "../../source/core/slang-string-util.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" // #include diff --git a/tools/slang-unit-test/unit-test-translation-unit-import.cpp b/tools/slang-unit-test/unit-test-translation-unit-import.cpp index 9870cf1e64..10cd33381f 100644 --- a/tools/slang-unit-test/unit-test-translation-unit-import.cpp +++ b/tools/slang-unit-test/unit-test-translation-unit-import.cpp @@ -4,7 +4,7 @@ #include "../../source/core/slang-process.h" #include "slang-com-ptr.h" #include "slang.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp index 00a705155f..16867f4cbb 100644 --- a/tools/test-server/test-server-main.cpp +++ b/tools/test-server/test-server-main.cpp @@ -12,7 +12,7 @@ #include "../../source/core/slang-writer.h" #include "slang-com-helper.h" #include "test-server-diagnostics.h" -#include "tools/unit-test/slang-unit-test.h" +#include "unit-test/slang-unit-test.h" #include #include diff --git a/tools/unit-test/slang-unit-test.cpp b/tools/unit-test/slang-unit-test.cpp index 61f778c9aa..c5a50613b3 100644 --- a/tools/unit-test/slang-unit-test.cpp +++ b/tools/unit-test/slang-unit-test.cpp @@ -1,7 +1,7 @@ #include "slang-unit-test.h" +#include "core/slang-basic.h" #include "slang.h" -#include "source/core/slang-basic.h" struct SlangUnitTest { diff --git a/tools/unit-test/slang-unit-test.h b/tools/unit-test/slang-unit-test.h index c63fb8a10a..3484b30204 100644 --- a/tools/unit-test/slang-unit-test.h +++ b/tools/unit-test/slang-unit-test.h @@ -1,7 +1,7 @@ #pragma once +#include "core/slang-render-api-util.h" #include "slang.h" -#include "source/core/slang-render-api-util.h" enum class TestResult {