diff options
| author | kaizhangNV <149626564+kaizhangNV@users.noreply.github.com> | 2024-07-17 12:53:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-17 10:53:19 -0700 |
| commit | 2db15080085856ed9b5f20642dbb354aac59a888 (patch) | |
| tree | 4f6558b8c3aac5e5191edaa092230ecb449f4a44 | |
| parent | 7d07bd29fee7dcd74fe73940723effc68f427e67 (diff) | |
Move the file public header files to `include` dir (#4636)
* Move the file public header files to `include` dir
Close the issue (#4635).
Move the following headers files to a `include` dir
located at root dir of slang repo:
slang-com-helper.h -> include/slang-com-helper.h
slang-com-ptr.h -> include/slang-com-ptr.h
slang-gfx.h -> include/slang-gfx.h
slang.h -> include/slang.h
Change cmake/SlangTarget.cmake to add include path to
every target, and change the source file to use
"#include <slang.h>" to include the public headers.
The source code update is by the script like follow:
```
fileNames_slang=$(grep -r "\".*slang\.h\"" source/ -l)
for fileName in "${fileNames_slang[@]}"
do
echo "$fileName"
sed -i "s/\".*slang\.h\"/\"slang\.h\"/" $fileName
done
```
* Fix the test issues
* Fix cpu test issues by adding include seach path
* Update cmake to not add include path for every target
Also change "#include <slang.h>" to "include "slang.h" " to
make the coding style consistent with other slang code.
* Change public include to private include for unit-test and slang-glslang
163 files changed, 245 insertions, 230 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 86bba5665..a51e84a50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,7 +207,7 @@ slang_add_target( EXCLUDE_FROM_ALL USE_EXTRA_WARNINGS LINK_WITH_PRIVATE miniz lz4_static Threads::Threads ${CMAKE_DL_LIBS} - INCLUDE_DIRECTORIES_PUBLIC source + INCLUDE_DIRECTORIES_PUBLIC source include ) if(SLANG_ENABLE_SLANGRT) @@ -219,6 +219,7 @@ if(SLANG_ENABLE_SLANGRT) USE_EXTRA_WARNINGS LINK_WITH_PRIVATE miniz lz4_static Threads::Threads ${CMAKE_DL_LIBS} EXPORT_MACRO_PREFIX SLANG_RT + INCLUDE_DIRECTORIES_PUBLIC include INSTALL ) endif() @@ -229,7 +230,6 @@ slang_add_target( EXCLUDE_FROM_ALL USE_EXTRA_WARNINGS LINK_WITH_PRIVATE core - INCLUDE_DIRECTORIES_PUBLIC source ) if(NOT MSVC) # This is necessary to compile the DXC headers @@ -334,6 +334,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG) MODULE USE_FEWER_WARNINGS LINK_WITH_PRIVATE glslang SPIRV SPIRV-Tools-opt + INCLUDE_DIRECTORIES_PRIVATE include INSTALL ) # Our only interface is through what we define in source/slang-glslang, in the @@ -520,7 +521,7 @@ if(SLANG_ENABLE_GFX) EXPORT_MACRO_PREFIX SLANG_GFX # slang-gfx is in this directory, anything which depends on gfx should include # this - INCLUDE_DIRECTORIES_PUBLIC . + INCLUDE_DIRECTORIES_PUBLIC . include REQUIRES copy-gfx-slang-modules INSTALL FOLDER gfx @@ -606,6 +607,7 @@ if(SLANG_ENABLE_TESTS) OBJECT EXCLUDE_FROM_ALL INCLUDE_FROM_PRIVATE slang + INCLUDE_DIRECTORIES_PRIVATE include FOLDER test ) diff --git a/examples/autodiff-texture/main.cpp b/examples/autodiff-texture/main.cpp index 5cd0a3523..01cad6fe4 100644 --- a/examples/autodiff-texture/main.cpp +++ b/examples/autodiff-texture/main.cpp @@ -5,7 +5,7 @@ #include "source/core/slang-basic.h" #include "tools/platform/vector-math.h" #include "tools/platform/window.h" -#include <slang.h> +#include "slang.h" using namespace gfx; using namespace Slang; diff --git a/examples/cpu-com-example/main.cpp b/examples/cpu-com-example/main.cpp index d75822e72..6da2aa0df 100644 --- a/examples/cpu-com-example/main.cpp +++ b/examples/cpu-com-example/main.cpp @@ -2,10 +2,10 @@ #include <stdio.h> -#include <slang.h> +#include "slang.h" -#include <slang-com-ptr.h> -#include <slang-com-helper.h> +#include "slang-com-ptr.h" +#include "slang-com-helper.h" // This includes a useful small function for setting up the prelude (described more further below). #include "../../source/core/slang-test-tool-util.h" diff --git a/examples/cpu-hello-world/main.cpp b/examples/cpu-hello-world/main.cpp index fedbf7ebe..7eb897cc2 100644 --- a/examples/cpu-hello-world/main.cpp +++ b/examples/cpu-hello-world/main.cpp @@ -16,12 +16,12 @@ // Of course, in order to use the Slang API, we need to include // its header. We have set up the build options for this project // so that it is as simple as: -#include <slang.h> +#include "slang.h" // Allows use of ComPtr - which we can use to scope any 'com-like' pointers easily -#include <slang-com-ptr.h> +#include "slang-com-ptr.h" // Provides macros for handling SlangResult values easily -#include <slang-com-helper.h> +#include "slang-com-helper.h" // This includes a useful small function for setting up the prelude (described more further below). #include "../../source/core/slang-test-tool-util.h" diff --git a/examples/gpu-printing/gpu-printing.h b/examples/gpu-printing/gpu-printing.h index 81c2e615f..64eaf770a 100644 --- a/examples/gpu-printing/gpu-printing.h +++ b/examples/gpu-printing/gpu-printing.h @@ -9,7 +9,7 @@ // strings that were specified in Slang shader code, and // for that it will use the Slang reflection API. // -#include <slang.h> +#include "slang.h" // We also need a way to store the data for strings that // were used in shader code, and we will go ahead and diff --git a/examples/gpu-printing/main.cpp b/examples/gpu-printing/main.cpp index 39b97a889..aa5beea95 100644 --- a/examples/gpu-printing/main.cpp +++ b/examples/gpu-printing/main.cpp @@ -1,9 +1,9 @@ // main.cpp #include <string> -#include <slang.h> +#include "slang.h" -#include <slang-com-ptr.h> +#include "slang-com-ptr.h" using Slang::ComPtr; #include "gpu-printing.h" diff --git a/examples/hello-world/main.cpp b/examples/hello-world/main.cpp index cdae6e92b..53285ae51 100644 --- a/examples/hello-world/main.cpp +++ b/examples/hello-world/main.cpp @@ -7,8 +7,8 @@ // The goal is to demonstrate how to use the Slang API to cross compile // shader code. // -#include <slang.h> -#include <slang-com-ptr.h> +#include "slang.h" +#include "slang-com-ptr.h" #include "vulkan-api.h" #include "examples/example-base/example-base.h" diff --git a/examples/model-viewer/main.cpp b/examples/model-viewer/main.cpp index 5f2a39441..8627fe2c4 100644 --- a/examples/model-viewer/main.cpp +++ b/examples/model-viewer/main.cpp @@ -16,7 +16,7 @@ // We still need to include the Slang header to use the Slang API // -#include <slang.h> +#include "slang.h" #include "slang-com-helper.h" // We will again make use of a graphics API abstraction diff --git a/examples/nv-aftermath-example/main.cpp b/examples/nv-aftermath-example/main.cpp index c4f40fda6..9850586c8 100644 --- a/examples/nv-aftermath-example/main.cpp +++ b/examples/nv-aftermath-example/main.cpp @@ -1,6 +1,6 @@ // main.cpp -#include <slang.h> +#include "slang.h" #include "slang-gfx.h" #include "gfx-util/shader-cursor.h" #include "tools/platform/window.h" diff --git a/examples/platform-test/main.cpp b/examples/platform-test/main.cpp index bfa00c5da..f20a5a716 100644 --- a/examples/platform-test/main.cpp +++ b/examples/platform-test/main.cpp @@ -1,4 +1,4 @@ -#include <slang.h> +#include "slang.h" #include "tools/platform/window.h" #include "examples/example-base/example-base.h" diff --git a/examples/ray-tracing-pipeline/main.cpp b/examples/ray-tracing-pipeline/main.cpp index a632761bc..c4da87756 100644 --- a/examples/ray-tracing-pipeline/main.cpp +++ b/examples/ray-tracing-pipeline/main.cpp @@ -3,7 +3,7 @@ // This file implements an example of hardware ray-tracing using // Slang shaders and the `gfx` graphics API. -#include <slang.h> +#include "slang.h" #include "slang-gfx.h" #include "gfx-util/shader-cursor.h" #include "tools/platform/window.h" diff --git a/examples/ray-tracing/main.cpp b/examples/ray-tracing/main.cpp index 6c1a6639d..2eb0a8481 100644 --- a/examples/ray-tracing/main.cpp +++ b/examples/ray-tracing/main.cpp @@ -3,7 +3,7 @@ // This file implements an example of hardware ray-tracing using // Slang shaders and the `gfx` graphics API. -#include <slang.h> +#include "slang.h" #include "slang-gfx.h" #include "gfx-util/shader-cursor.h" #include "tools/platform/window.h" diff --git a/examples/shader-object/main.cpp b/examples/shader-object/main.cpp index c4940e78f..15e2df54c 100644 --- a/examples/shader-object/main.cpp +++ b/examples/shader-object/main.cpp @@ -8,8 +8,8 @@ // simplifies shader specialization and parameter binding when using `interface` typed // shader parameters. // -#include <slang.h> -#include <slang-com-ptr.h> +#include "slang.h" +#include "slang-com-ptr.h" using Slang::ComPtr; #include "slang-gfx.h" diff --git a/examples/shader-toy/main.cpp b/examples/shader-toy/main.cpp index 105c74cc0..13a79c7ee 100644 --- a/examples/shader-toy/main.cpp +++ b/examples/shader-toy/main.cpp @@ -10,8 +10,8 @@ // This example uses the Slang C/C++ API, alonmg with its optional type // for managing COM-style reference-counted pointers. // -#include <slang.h> -#include <slang-com-ptr.h> +#include "slang.h" +#include "slang-com-ptr.h" using Slang::ComPtr; // This example uses a graphics API abstraction layer that is implemented inside diff --git a/examples/triangle/main.cpp b/examples/triangle/main.cpp index 90589c157..93ae1bd2e 100644 --- a/examples/triangle/main.cpp +++ b/examples/triangle/main.cpp @@ -14,7 +14,7 @@ // its header. We have set up the build options for this project // so that it is as simple as: // -#include <slang.h> +#include "slang.h" // // Other build setups are possible, and Slang doesn't assume that // its include directory must be added to your global include diff --git a/slang-com-helper.h b/include/slang-com-helper.h index fc8b7de58..fc8b7de58 100644 --- a/slang-com-helper.h +++ b/include/slang-com-helper.h diff --git a/slang-com-ptr.h b/include/slang-com-ptr.h index 00cc9dbb1..00cc9dbb1 100644 --- a/slang-com-ptr.h +++ b/include/slang-com-ptr.h diff --git a/slang-gfx.h b/include/slang-gfx.h index d273ce427..d273ce427 100644 --- a/slang-gfx.h +++ b/include/slang-gfx.h diff --git a/slang.h b/include/slang.h index 2f8f8d15d..2f8f8d15d 100644 --- a/slang.h +++ b/include/slang.h diff --git a/prelude/CMakeLists.txt b/prelude/CMakeLists.txt index 6b5c190e7..173cce542 100644 --- a/prelude/CMakeLists.txt +++ b/prelude/CMakeLists.txt @@ -24,7 +24,7 @@ slang_add_target( EXPLICIT_SOURCE ${SLANG_PRELUDE_SOURCE} EXCLUDE_FROM_ALL TARGET_NAME prelude - INCLUDE_DIRECTORIES_PUBLIC ${CMAKE_CURRENT_LIST_DIR} + INCLUDE_DIRECTORIES_PUBLIC ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/../include PUBLIC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/slang*.h # It's an object library, so the install step only installs the headers INSTALL diff --git a/prelude/slang-cpp-host-prelude.h b/prelude/slang-cpp-host-prelude.h index f69d03eed..48056169d 100644 --- a/prelude/slang-cpp-host-prelude.h +++ b/prelude/slang-cpp-host-prelude.h @@ -8,7 +8,7 @@ #define SLANG_COM_PTR_ENABLE_REF_OPERATOR 1 #include "../source/slang-rt/slang-rt.h" -#include "../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "slang-cpp-types.h" #ifdef SLANG_LLVM diff --git a/source/compiler-core/slang-artifact-associated-impl.h b/source/compiler-core/slang-artifact-associated-impl.h index 8506f1628..5144fe7a7 100644 --- a/source/compiler-core/slang-artifact-associated-impl.h +++ b/source/compiler-core/slang-artifact-associated-impl.h @@ -2,8 +2,8 @@ #ifndef SLANG_ARTIFACT_ASSOCIATED_IMPL_H #define SLANG_ARTIFACT_ASSOCIATED_IMPL_H -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-com-object.h" #include "../core/slang-memory-arena.h" diff --git a/source/compiler-core/slang-artifact-container-util.h b/source/compiler-core/slang-artifact-container-util.h index 68c1f11f5..eb0a12dfc 100644 --- a/source/compiler-core/slang-artifact-container-util.h +++ b/source/compiler-core/slang-artifact-container-util.h @@ -4,8 +4,8 @@ #include "slang-artifact-representation.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" namespace Slang { diff --git a/source/compiler-core/slang-artifact-impl.h b/source/compiler-core/slang-artifact-impl.h index 4862142a8..22547d3ef 100644 --- a/source/compiler-core/slang-artifact-impl.h +++ b/source/compiler-core/slang-artifact-impl.h @@ -4,8 +4,8 @@ #include "slang-artifact.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-com-object.h" diff --git a/source/compiler-core/slang-artifact-representation-impl.h b/source/compiler-core/slang-artifact-representation-impl.h index 5c76b9e7c..034084950 100644 --- a/source/compiler-core/slang-artifact-representation-impl.h +++ b/source/compiler-core/slang-artifact-representation-impl.h @@ -4,8 +4,8 @@ #include "slang-artifact-representation.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-com-object.h" #include "../core/slang-memory-arena.h" diff --git a/source/compiler-core/slang-artifact-util.h b/source/compiler-core/slang-artifact-util.h index 792e6ff94..5341f309b 100644 --- a/source/compiler-core/slang-artifact-util.h +++ b/source/compiler-core/slang-artifact-util.h @@ -6,7 +6,7 @@ #include "slang-artifact-representation.h" #include "slang-artifact-associated.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" namespace Slang { diff --git a/source/compiler-core/slang-artifact.h b/source/compiler-core/slang-artifact.h index 4f33f5e2e..400c85b2e 100644 --- a/source/compiler-core/slang-artifact.h +++ b/source/compiler-core/slang-artifact.h @@ -3,7 +3,7 @@ #define SLANG_ARTIFACT_H #include "../core/slang-basic.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include <type_traits> diff --git a/source/compiler-core/slang-core-diagnostics.h b/source/compiler-core/slang-core-diagnostics.h index 2d56591fd..fd1906fae 100644 --- a/source/compiler-core/slang-core-diagnostics.h +++ b/source/compiler-core/slang-core-diagnostics.h @@ -8,7 +8,7 @@ #include "slang-diagnostic-sink.h" #include "slang-token.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/compiler-core/slang-diagnostic-sink.h b/source/compiler-core/slang-diagnostic-sink.h index 6e3c4ccb8..38a31752f 100644 --- a/source/compiler-core/slang-diagnostic-sink.h +++ b/source/compiler-core/slang-diagnostic-sink.h @@ -8,7 +8,7 @@ #include "slang-source-loc.h" #include "slang-token.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/compiler-core/slang-downstream-compiler-util.cpp b/source/compiler-core/slang-downstream-compiler-util.cpp index 70ecb8ad7..70063b772 100644 --- a/source/compiler-core/slang-downstream-compiler-util.cpp +++ b/source/compiler-core/slang-downstream-compiler-util.cpp @@ -2,7 +2,7 @@ #include "slang-downstream-compiler-util.h" #include "../core/slang-common.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-string-util.h" #include "../core/slang-type-text-util.h" diff --git a/source/compiler-core/slang-downstream-compiler.cpp b/source/compiler-core/slang-downstream-compiler.cpp index 88081ad84..855319176 100644 --- a/source/compiler-core/slang-downstream-compiler.cpp +++ b/source/compiler-core/slang-downstream-compiler.cpp @@ -2,7 +2,7 @@ #include "slang-downstream-compiler.h" #include "../core/slang-common.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-string-util.h" #include "../core/slang-type-text-util.h" diff --git a/source/compiler-core/slang-downstream-compiler.h b/source/compiler-core/slang-downstream-compiler.h index c8cd02783..14e924f8b 100644 --- a/source/compiler-core/slang-downstream-compiler.h +++ b/source/compiler-core/slang-downstream-compiler.h @@ -11,7 +11,7 @@ #include "../core/slang-io.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "slang-artifact.h" #include "slang-artifact-associated.h" diff --git a/source/compiler-core/slang-dxc-compiler.cpp b/source/compiler-core/slang-dxc-compiler.cpp index fc42dfc40..aa005d47f 100644 --- a/source/compiler-core/slang-dxc-compiler.cpp +++ b/source/compiler-core/slang-dxc-compiler.cpp @@ -2,7 +2,7 @@ #include "slang-dxc-compiler.h" #include "../core/slang-common.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-blob.h" diff --git a/source/compiler-core/slang-fxc-compiler.cpp b/source/compiler-core/slang-fxc-compiler.cpp index ed92cc3f8..e4a9f25c7 100644 --- a/source/compiler-core/slang-fxc-compiler.cpp +++ b/source/compiler-core/slang-fxc-compiler.cpp @@ -4,7 +4,7 @@ #if SLANG_ENABLE_DXBC_SUPPORT #include "../core/slang-common.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-blob.h" diff --git a/source/compiler-core/slang-gcc-compiler-util.cpp b/source/compiler-core/slang-gcc-compiler-util.cpp index 01f197875..875f7bea1 100644 --- a/source/compiler-core/slang-gcc-compiler-util.cpp +++ b/source/compiler-core/slang-gcc-compiler-util.cpp @@ -2,7 +2,7 @@ #include "slang-gcc-compiler-util.h" #include "../core/slang-common.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-string-util.h" #include "../core/slang-io.h" @@ -210,7 +210,7 @@ static SlangResult _parseGCCFamilyLine(SliceAllocator& allocator, const UnownedS clang-7: error: linker command failed with exit code 1 (use -v to see invocation)*/ /* /path/slang-cpp-prelude.h:4:10: fatal error: ../slang.h: No such file or directory - #include "../slang.h" + #include "slang.h" ^~~~~~~~~~~~ compilation terminated.*/ diff --git a/source/compiler-core/slang-glslang-compiler.cpp b/source/compiler-core/slang-glslang-compiler.cpp index 0335c33b4..e0a537757 100644 --- a/source/compiler-core/slang-glslang-compiler.cpp +++ b/source/compiler-core/slang-glslang-compiler.cpp @@ -2,7 +2,7 @@ #include "slang-glslang-compiler.h" #include "../core/slang-common.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-blob.h" diff --git a/source/compiler-core/slang-json-diagnostics.h b/source/compiler-core/slang-json-diagnostics.h index 88ec0c550..d819d8947 100644 --- a/source/compiler-core/slang-json-diagnostics.h +++ b/source/compiler-core/slang-json-diagnostics.h @@ -8,7 +8,7 @@ #include "slang-diagnostic-sink.h" #include "slang-token.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/compiler-core/slang-json-native.cpp b/source/compiler-core/slang-json-native.cpp index 8b0ec1194..eb0f7d9ee 100644 --- a/source/compiler-core/slang-json-native.cpp +++ b/source/compiler-core/slang-json-native.cpp @@ -1,6 +1,6 @@ #include "slang-json-native.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-rtti-util.h" diff --git a/source/compiler-core/slang-json-native.h b/source/compiler-core/slang-json-native.h index 72e339621..6920d59e9 100644 --- a/source/compiler-core/slang-json-native.h +++ b/source/compiler-core/slang-json-native.h @@ -1,9 +1,9 @@ #ifndef SLANG_COMPILER_CORE_JSON_NATIVE_H #define SLANG_COMPILER_CORE_JSON_NATIVE_H -#include "../../slang.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "slang-json-value.h" diff --git a/source/compiler-core/slang-json-rpc.cpp b/source/compiler-core/slang-json-rpc.cpp index 3474718c7..f4a61da1e 100644 --- a/source/compiler-core/slang-json-rpc.cpp +++ b/source/compiler-core/slang-json-rpc.cpp @@ -1,6 +1,6 @@ #include "slang-json-rpc.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "slang-json-native.h" diff --git a/source/compiler-core/slang-json-rpc.h b/source/compiler-core/slang-json-rpc.h index f32513b02..6baba7829 100644 --- a/source/compiler-core/slang-json-rpc.h +++ b/source/compiler-core/slang-json-rpc.h @@ -1,9 +1,9 @@ #ifndef SLANG_COMPILER_CORE_JSON_RPC_H #define SLANG_COMPILER_CORE_JSON_RPC_H -#include "../../slang.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "slang-json-value.h" diff --git a/source/compiler-core/slang-json-source-map-util.cpp b/source/compiler-core/slang-json-source-map-util.cpp index 30d722c4c..f66ee50da 100644 --- a/source/compiler-core/slang-json-source-map-util.cpp +++ b/source/compiler-core/slang-json-source-map-util.cpp @@ -1,6 +1,6 @@ #include "slang-json-source-map-util.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-string-util.h" #include "../core/slang-blob.h" diff --git a/source/compiler-core/slang-language-server-protocol.h b/source/compiler-core/slang-language-server-protocol.h index 3dcc90be1..ff5cd394e 100644 --- a/source/compiler-core/slang-language-server-protocol.h +++ b/source/compiler-core/slang-language-server-protocol.h @@ -1,8 +1,8 @@ #pragma once -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" -#include "../../slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" +#include "slang.h" #include "../../source/core/slang-rtti-info.h" #include "../../source/compiler-core/slang-json-value.h" diff --git a/source/compiler-core/slang-nvrtc-compiler.cpp b/source/compiler-core/slang-nvrtc-compiler.cpp index b84b1a403..80fde277b 100644 --- a/source/compiler-core/slang-nvrtc-compiler.cpp +++ b/source/compiler-core/slang-nvrtc-compiler.cpp @@ -2,7 +2,7 @@ #include "slang-nvrtc-compiler.h" #include "../core/slang-common.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-blob.h" diff --git a/source/compiler-core/slang-slice-allocator.h b/source/compiler-core/slang-slice-allocator.h index a6f0cd5c1..8d61fa211 100644 --- a/source/compiler-core/slang-slice-allocator.h +++ b/source/compiler-core/slang-slice-allocator.h @@ -4,7 +4,7 @@ // Has definition of CharSlice #include "slang-artifact.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "../core/slang-memory-arena.h" diff --git a/source/compiler-core/slang-source-embed-util.h b/source/compiler-core/slang-source-embed-util.h index 70389cfe1..52115e4ef 100644 --- a/source/compiler-core/slang-source-embed-util.h +++ b/source/compiler-core/slang-source-embed-util.h @@ -6,7 +6,7 @@ #include "slang-artifact.h" #include "slang-diagnostic-sink.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "../core/slang-name-value.h" diff --git a/source/compiler-core/slang-source-loc.h b/source/compiler-core/slang-source-loc.h index 0a94980d1..bf0be47f6 100644 --- a/source/compiler-core/slang-source-loc.h +++ b/source/compiler-core/slang-source-loc.h @@ -10,8 +10,8 @@ #include "slang-source-map.h" -#include "../../slang-com-ptr.h" -#include "../../slang.h" +#include "slang-com-ptr.h" +#include "slang.h" namespace Slang { diff --git a/source/compiler-core/slang-source-map.h b/source/compiler-core/slang-source-map.h index 0c55d3a1a..4060fadb8 100644 --- a/source/compiler-core/slang-source-map.h +++ b/source/compiler-core/slang-source-map.h @@ -1,7 +1,7 @@ #ifndef SLANG_COMPILER_CORE_SOURCE_MAP_H #define SLANG_COMPILER_CORE_SOURCE_MAP_H -#include "../../slang.h" +#include "slang.h" #include "../core/slang-string.h" #include "../core/slang-list.h" diff --git a/source/compiler-core/slang-test-server-protocol.h b/source/compiler-core/slang-test-server-protocol.h index 8b61c4b39..b74a1a872 100644 --- a/source/compiler-core/slang-test-server-protocol.h +++ b/source/compiler-core/slang-test-server-protocol.h @@ -1,9 +1,9 @@ #ifndef SLANG_COMPILER_CORE_TEST_PROTOCOL_H #define SLANG_COMPILER_CORE_TEST_PROTOCOL_H -#include "../../slang.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-rtti-info.h" #include "slang-json-value.h" diff --git a/source/compiler-core/slang-visual-studio-compiler-util.cpp b/source/compiler-core/slang-visual-studio-compiler-util.cpp index 753d256a6..df3285608 100644 --- a/source/compiler-core/slang-visual-studio-compiler-util.cpp +++ b/source/compiler-core/slang-visual-studio-compiler-util.cpp @@ -2,7 +2,7 @@ #include "slang-visual-studio-compiler-util.h" #include "../core/slang-common.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-string-util.h" #include "../core/slang-string-slice-pool.h" diff --git a/source/core/slang-archive-file-system.cpp b/source/core/slang-archive-file-system.cpp index 03237105d..e219fcbb5 100644 --- a/source/core/slang-archive-file-system.cpp +++ b/source/core/slang-archive-file-system.cpp @@ -1,7 +1,7 @@ #include "slang-archive-file-system.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-castable.h" diff --git a/source/core/slang-archive-file-system.h b/source/core/slang-archive-file-system.h index cee119c13..13b226019 100644 --- a/source/core/slang-archive-file-system.h +++ b/source/core/slang-archive-file-system.h @@ -3,7 +3,7 @@ #include "slang-basic.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "slang-compression-system.h" diff --git a/source/core/slang-blob.h b/source/core/slang-blob.h index e678680aa..4df8f0db6 100644 --- a/source/core/slang-blob.h +++ b/source/core/slang-blob.h @@ -1,15 +1,15 @@ #ifndef SLANG_CORE_BLOB_H #define SLANG_CORE_BLOB_H -#include "../../slang.h" +#include "slang.h" #include "slang-string.h" #include "slang-list.h" #include <stdarg.h> -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-com-object.h" diff --git a/source/core/slang-castable.h b/source/core/slang-castable.h index dc6c49a89..e2b9c4a8e 100644 --- a/source/core/slang-castable.h +++ b/source/core/slang-castable.h @@ -3,8 +3,8 @@ #define SLANG_CASTABLE_H -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-com-object.h" diff --git a/source/core/slang-chunked-list.h b/source/core/slang-chunked-list.h index 0ac26c945..d414eaefb 100644 --- a/source/core/slang-chunked-list.h +++ b/source/core/slang-chunked-list.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_CHUNKED_LIST_H #define SLANG_CORE_CHUNKED_LIST_H -#include "../../slang.h" +#include "slang.h" #include "slang-allocator.h" #include "slang-array-view.h" diff --git a/source/core/slang-command-line.cpp b/source/core/slang-command-line.cpp index 475270d69..bfd9ed11a 100644 --- a/source/core/slang-command-line.cpp +++ b/source/core/slang-command-line.cpp @@ -7,7 +7,7 @@ #include "slang-string-escape-util.h" #include "slang-string-util.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" namespace Slang { diff --git a/source/core/slang-common.h b/source/core/slang-common.h index 7d455546a..362a509a7 100644 --- a/source/core/slang-common.h +++ b/source/core/slang-common.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_COMMON_H #define SLANG_CORE_COMMON_H -#include "../../slang.h" +#include "slang.h" #include <assert.h> diff --git a/source/core/slang-crypto.h b/source/core/slang-crypto.h index 01d6004d0..feab88aa4 100644 --- a/source/core/slang-crypto.h +++ b/source/core/slang-crypto.h @@ -1,5 +1,5 @@ #pragma once -#include "../../slang.h" +#include "slang.h" #include "../core/slang-string.h" #include "../core/slang-blob.h" #include "../core/slang-list.h" diff --git a/source/core/slang-deflate-compression-system.cpp b/source/core/slang-deflate-compression-system.cpp index a8e6302cf..4f1390240 100644 --- a/source/core/slang-deflate-compression-system.cpp +++ b/source/core/slang-deflate-compression-system.cpp @@ -1,7 +1,7 @@ #include "slang-deflate-compression-system.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" // We don't want compress #define to clash #define MINIZ_NO_ZLIB_COMPATIBLE_NAMES 1 diff --git a/source/core/slang-deflate-compression-system.h b/source/core/slang-deflate-compression-system.h index 6dc96af5d..efed59e61 100644 --- a/source/core/slang-deflate-compression-system.h +++ b/source/core/slang-deflate-compression-system.h @@ -5,7 +5,7 @@ #include "slang-compression-system.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" namespace Slang { diff --git a/source/core/slang-file-system.cpp b/source/core/slang-file-system.cpp index 7c3cd83bb..d578e63d5 100644 --- a/source/core/slang-file-system.cpp +++ b/source/core/slang-file-system.cpp @@ -1,6 +1,6 @@ #include "slang-file-system.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "../core/slang-io.h" #include "../core/slang-string-util.h" diff --git a/source/core/slang-file-system.h b/source/core/slang-file-system.h index 6e29e277c..dad2731d9 100644 --- a/source/core/slang-file-system.h +++ b/source/core/slang-file-system.h @@ -1,9 +1,9 @@ #ifndef SLANG_FILE_SYSTEM_H_INCLUDED #define SLANG_FILE_SYSTEM_H_INCLUDED -#include "../../slang.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-blob.h" diff --git a/source/core/slang-free-list.h b/source/core/slang-free-list.h index 090c13613..5c4e55607 100644 --- a/source/core/slang-free-list.h +++ b/source/core/slang-free-list.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_FREE_LIST_H #define SLANG_CORE_FREE_LIST_H -#include "../../slang.h" +#include "slang.h" #include "slang-common.h" diff --git a/source/core/slang-hash.h b/source/core/slang-hash.h index 9a173c4f8..7992e91fa 100644 --- a/source/core/slang-hash.h +++ b/source/core/slang-hash.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_HASH_H #define SLANG_CORE_HASH_H -#include "../../slang.h" +#include "slang.h" #include "slang-math.h" #include "../../external/unordered_dense/include/ankerl/unordered_dense.h" #include <cstring> diff --git a/source/core/slang-hex-dump-util.cpp b/source/core/slang-hex-dump-util.cpp index 3a78c256a..46fe825ac 100644 --- a/source/core/slang-hex-dump-util.cpp +++ b/source/core/slang-hex-dump-util.cpp @@ -7,7 +7,7 @@ #include "slang-char-util.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "slang-hash.h" namespace Slang diff --git a/source/core/slang-hex-dump-util.h b/source/core/slang-hex-dump-util.h index f02728522..037355f2d 100644 --- a/source/core/slang-hex-dump-util.h +++ b/source/core/slang-hex-dump-util.h @@ -5,7 +5,7 @@ #include "slang-string.h" #include "slang-list.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/core/slang-http.h b/source/core/slang-http.h index 784357273..11d834bd8 100644 --- a/source/core/slang-http.h +++ b/source/core/slang-http.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_HTTP_H #define SLANG_CORE_HTTP_H -#include "../../slang.h" +#include "slang.h" #include "slang-string.h" #include "slang-list.h" @@ -10,8 +10,8 @@ #include "slang-stream.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" namespace Slang { diff --git a/source/core/slang-io.cpp b/source/core/slang-io.cpp index c08f499b9..f5850a5b6 100644 --- a/source/core/slang-io.cpp +++ b/source/core/slang-io.cpp @@ -3,7 +3,7 @@ #include "slang-io.h" #include "slang-exception.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "slang-string-util.h" #include "slang-char-util.h" diff --git a/source/core/slang-linked-list.h b/source/core/slang-linked-list.h index 840ef8cd6..d442b4d12 100644 --- a/source/core/slang-linked-list.h +++ b/source/core/slang-linked-list.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_LINKED_LIST_H #define SLANG_CORE_LINKED_LIST_H -#include "../../slang.h" +#include "slang.h" #include "slang-allocator.h" #include <type_traits> diff --git a/source/core/slang-list.h b/source/core/slang-list.h index c0fe28937..b1c67e438 100644 --- a/source/core/slang-list.h +++ b/source/core/slang-list.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_LIST_H #define SLANG_CORE_LIST_H -#include "../../slang.h" +#include "slang.h" #include "slang-allocator.h" #include "slang-math.h" diff --git a/source/core/slang-lz4-compression-system.cpp b/source/core/slang-lz4-compression-system.cpp index 4b8661534..c20b457df 100644 --- a/source/core/slang-lz4-compression-system.cpp +++ b/source/core/slang-lz4-compression-system.cpp @@ -1,7 +1,7 @@ #include "slang-lz4-compression-system.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "slang-blob.h" diff --git a/source/core/slang-lz4-compression-system.h b/source/core/slang-lz4-compression-system.h index 1bd7cefcf..d74fbd61a 100644 --- a/source/core/slang-lz4-compression-system.h +++ b/source/core/slang-lz4-compression-system.h @@ -5,7 +5,7 @@ #include "slang-compression-system.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" namespace Slang { diff --git a/source/core/slang-memory-arena.h b/source/core/slang-memory-arena.h index 4d2372e44..cbd0fdc56 100644 --- a/source/core/slang-memory-arena.h +++ b/source/core/slang-memory-arena.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_MEMORY_ARENA_H #define SLANG_CORE_MEMORY_ARENA_H -#include "../../slang.h" +#include "slang.h" #include <stdlib.h> #include <string.h> diff --git a/source/core/slang-memory-file-system.h b/source/core/slang-memory-file-system.h index 785335986..321f7fe74 100644 --- a/source/core/slang-memory-file-system.h +++ b/source/core/slang-memory-file-system.h @@ -3,7 +3,7 @@ #include "slang-basic.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "slang-com-object.h" namespace Slang diff --git a/source/core/slang-performance-profiler.h b/source/core/slang-performance-profiler.h index f7c62bb45..372a7b273 100644 --- a/source/core/slang-performance-profiler.h +++ b/source/core/slang-performance-profiler.h @@ -4,7 +4,7 @@ #include "slang-string.h" #include <chrono> #include <vector> -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-list.h" namespace Slang diff --git a/source/core/slang-persistent-cache.h b/source/core/slang-persistent-cache.h index db5ef0a2e..02c74be79 100644 --- a/source/core/slang-persistent-cache.h +++ b/source/core/slang-persistent-cache.h @@ -1,5 +1,5 @@ #pragma once -#include "../../slang.h" +#include "slang.h" #include "../core/slang-crypto.h" #include "../core/slang-io.h" #include "../core/slang-string.h" diff --git a/source/core/slang-platform.h b/source/core/slang-platform.h index 2aa9184b0..f8701e305 100644 --- a/source/core/slang-platform.h +++ b/source/core/slang-platform.h @@ -2,7 +2,7 @@ #ifndef SLANG_CORE_PLATFORM_H #define SLANG_CORE_PLATFORM_H -#include "../../slang.h" +#include "slang.h" #include "../core/slang-string.h" namespace Slang diff --git a/source/core/slang-process-util.cpp b/source/core/slang-process-util.cpp index 99c81ee5c..47484156d 100644 --- a/source/core/slang-process-util.cpp +++ b/source/core/slang-process-util.cpp @@ -6,7 +6,7 @@ #include "slang-string-escape-util.h" #include "slang-string-util.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" namespace Slang { diff --git a/source/core/slang-random-generator.h b/source/core/slang-random-generator.h index 392b4cb4c..fa83fec3b 100644 --- a/source/core/slang-random-generator.h +++ b/source/core/slang-random-generator.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_RANDOM_GENERATOR_H #define SLANG_CORE_RANDOM_GENERATOR_H -#include "../../slang.h" +#include "slang.h" #include <stdlib.h> #include <string.h> diff --git a/source/core/slang-render-api-util.cpp b/source/core/slang-render-api-util.cpp index fce66be90..4fd345840 100644 --- a/source/core/slang-render-api-util.cpp +++ b/source/core/slang-render-api-util.cpp @@ -1,7 +1,7 @@ #include "slang-render-api-util.h" -#include "../../slang.h" +#include "slang.h" #include "slang-list.h" #include "slang-string-util.h" diff --git a/source/core/slang-render-api-util.h b/source/core/slang-render-api-util.h index 7a2848038..41728e5f2 100644 --- a/source/core/slang-render-api-util.h +++ b/source/core/slang-render-api-util.h @@ -3,7 +3,7 @@ #include "../../source/core/slang-string.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" namespace Slang { diff --git a/source/core/slang-riff-file-system.cpp b/source/core/slang-riff-file-system.cpp index 1fb867500..1072db186 100644 --- a/source/core/slang-riff-file-system.cpp +++ b/source/core/slang-riff-file-system.cpp @@ -1,7 +1,7 @@ #include "slang-riff-file-system.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "slang-blob.h" diff --git a/source/core/slang-riff.cpp b/source/core/slang-riff.cpp index a90c65db9..83693433e 100644 --- a/source/core/slang-riff.cpp +++ b/source/core/slang-riff.cpp @@ -1,6 +1,6 @@ #include "slang-riff.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "slang-hex-dump-util.h" diff --git a/source/core/slang-rtti-info.cpp b/source/core/slang-rtti-info.cpp index 9e0a3796a..de0460082 100644 --- a/source/core/slang-rtti-info.cpp +++ b/source/core/slang-rtti-info.cpp @@ -1,6 +1,6 @@ #include "slang-rtti-info.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "slang-rtti-util.h" diff --git a/source/core/slang-semantic-version.cpp b/source/core/slang-semantic-version.cpp index 550ea993b..9e68de746 100644 --- a/source/core/slang-semantic-version.cpp +++ b/source/core/slang-semantic-version.cpp @@ -1,7 +1,7 @@ // slang-semantic-version.cpp #include "slang-semantic-version.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../core/slang-string-util.h" diff --git a/source/core/slang-shared-library.cpp b/source/core/slang-shared-library.cpp index c3991ad06..34464597c 100644 --- a/source/core/slang-shared-library.cpp +++ b/source/core/slang-shared-library.cpp @@ -1,6 +1,6 @@ #include "slang-shared-library.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "slang-io.h" #include "slang-string-util.h" diff --git a/source/core/slang-shared-library.h b/source/core/slang-shared-library.h index ab91a6501..d6c1618ec 100644 --- a/source/core/slang-shared-library.h +++ b/source/core/slang-shared-library.h @@ -1,9 +1,9 @@ #ifndef SLANG_CORE_SHARED_LIBRARY_H #define SLANG_CORE_SHARED_LIBRARY_H -#include "../../slang.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../core/slang-com-object.h" #include "../core/slang-io.h" diff --git a/source/core/slang-short-list.h b/source/core/slang-short-list.h index adbb935e6..66165fc72 100644 --- a/source/core/slang-short-list.h +++ b/source/core/slang-short-list.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_SHORT_LIST_H #define SLANG_CORE_SHORT_LIST_H -#include "../../slang.h" +#include "slang.h" #include "slang-allocator.h" #include "slang-math.h" diff --git a/source/core/slang-smart-pointer.h b/source/core/slang-smart-pointer.h index a161f1b83..5cf8e4323 100644 --- a/source/core/slang-smart-pointer.h +++ b/source/core/slang-smart-pointer.h @@ -5,7 +5,7 @@ #include "slang-hash.h" #include "slang-type-traits.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/core/slang-std-writers.h b/source/core/slang-std-writers.h index 84447186a..e99b386e3 100644 --- a/source/core/slang-std-writers.h +++ b/source/core/slang-std-writers.h @@ -2,7 +2,7 @@ #define SLANG_CORE_STD_WRITERS_H #include "slang-writer.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" namespace Slang { diff --git a/source/core/slang-string-escape-util.cpp b/source/core/slang-string-escape-util.cpp index 334c1aae5..77399552e 100644 --- a/source/core/slang-string-escape-util.cpp +++ b/source/core/slang-string-escape-util.cpp @@ -4,7 +4,7 @@ #include "slang-text-io.h" #include "slang-memory-arena.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" namespace Slang { diff --git a/source/core/slang-string-util.h b/source/core/slang-string-util.h index 7e5733cbb..c0a8f6973 100644 --- a/source/core/slang-string-util.h +++ b/source/core/slang-string-util.h @@ -6,8 +6,8 @@ #include <stdarg.h> -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" namespace Slang { diff --git a/source/core/slang-test-tool-util.cpp b/source/core/slang-test-tool-util.cpp index 74802e233..dad06effe 100644 --- a/source/core/slang-test-tool-util.cpp +++ b/source/core/slang-test-tool-util.cpp @@ -1,7 +1,7 @@ #include "slang-test-tool-util.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "slang-io.h" #include "slang-string-util.h" diff --git a/source/core/slang-text-io.cpp b/source/core/slang-text-io.cpp index 327ef55de..f7257c1ee 100644 --- a/source/core/slang-text-io.cpp +++ b/source/core/slang-text-io.cpp @@ -1,6 +1,6 @@ #include "slang-text-io.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" namespace Slang { diff --git a/source/core/slang-type-convert-util.h b/source/core/slang-type-convert-util.h index 00b47a154..70565b896 100644 --- a/source/core/slang-type-convert-util.h +++ b/source/core/slang-type-convert-util.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_TYPE_CONVERT_UTIL_H #define SLANG_CORE_TYPE_CONVERT_UTIL_H -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/core/slang-type-text-util.h b/source/core/slang-type-text-util.h index 219dcd5f2..6d07e7d58 100644 --- a/source/core/slang-type-text-util.h +++ b/source/core/slang-type-text-util.h @@ -1,7 +1,7 @@ #ifndef SLANG_CORE_TYPE_TEXT_UTIL_H #define SLANG_CORE_TYPE_TEXT_UTIL_H -#include "../../slang.h" +#include "slang.h" #include "slang-string.h" #include "slang-array-view.h" diff --git a/source/core/slang-writer.h b/source/core/slang-writer.h index 2a86af629..e29939161 100644 --- a/source/core/slang-writer.h +++ b/source/core/slang-writer.h @@ -3,8 +3,8 @@ #include "slang-string.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "slang-list.h" diff --git a/source/core/slang-zip-file-system.cpp b/source/core/slang-zip-file-system.cpp index 9944bd9cf..02d4c9a2b 100644 --- a/source/core/slang-zip-file-system.cpp +++ b/source/core/slang-zip-file-system.cpp @@ -1,7 +1,7 @@ #include "slang-zip-file-system.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "slang-io.h" #include "slang-string-util.h" diff --git a/source/core/windows/slang-win-process.cpp b/source/core/windows/slang-win-process.cpp index 8b41393ae..3aa21deb5 100644 --- a/source/core/windows/slang-win-process.cpp +++ b/source/core/windows/slang-win-process.cpp @@ -6,7 +6,7 @@ #include "../slang-string-util.h" #include "../slang-process-util.h" -#include "../../../slang-com-helper.h" +#include "slang-com-helper.h" #ifdef _WIN32 // TODO: We could try to avoid including this at all, but it would diff --git a/source/slang-capture-replay/slang-composite-component-type.h b/source/slang-capture-replay/slang-composite-component-type.h index adafe5b11..61ebe4cc0 100644 --- a/source/slang-capture-replay/slang-composite-component-type.h +++ b/source/slang-capture-replay/slang-composite-component-type.h @@ -1,9 +1,9 @@ #ifndef SLANG_COMPOSITE_COMPONENT_TYPE_H #define SLANG_COMPOSITE_COMPONENT_TYPE_H -#include "../../slang-com-ptr.h" -#include "../../slang.h" -#include "../../slang-com-helper.h" +#include "slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" #include "../core/slang-smart-pointer.h" #include "../core/slang-dictionary.h" #include "../slang/slang-compiler.h" diff --git a/source/slang-capture-replay/slang-entrypoint.h b/source/slang-capture-replay/slang-entrypoint.h index 06a577069..5dbe9b14b 100644 --- a/source/slang-capture-replay/slang-entrypoint.h +++ b/source/slang-capture-replay/slang-entrypoint.h @@ -1,9 +1,9 @@ #ifndef SLANG_ENTRY_POINT_H #define SLANG_ENTRY_POINT_H -#include "../../slang-com-ptr.h" -#include "../../slang.h" -#include "../../slang-com-helper.h" +#include "slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" #include "../core/slang-smart-pointer.h" #include "../core/slang-dictionary.h" #include "../slang/slang-compiler.h" diff --git a/source/slang-capture-replay/slang-filesystem.h b/source/slang-capture-replay/slang-filesystem.h index f4435c994..1a7c8c2e2 100644 --- a/source/slang-capture-replay/slang-filesystem.h +++ b/source/slang-capture-replay/slang-filesystem.h @@ -2,8 +2,8 @@ #define SLANG_FILE_SYSTEM_H #include "../core/slang-com-object.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "capture-manager.h" namespace SlangCapture diff --git a/source/slang-capture-replay/slang-global-session.h b/source/slang-capture-replay/slang-global-session.h index ef7036baf..ae451505f 100644 --- a/source/slang-capture-replay/slang-global-session.h +++ b/source/slang-capture-replay/slang-global-session.h @@ -1,9 +1,9 @@ #ifndef SLANG_GLOBAL_SESSION_H #define SLANG_GLOBAL_SESSION_H -#include "../../slang-com-ptr.h" -#include "../../slang.h" -#include "../../slang-com-helper.h" +#include "slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" #include "../core/slang-smart-pointer.h" #include "capture-manager.h" diff --git a/source/slang-capture-replay/slang-module.h b/source/slang-capture-replay/slang-module.h index 5243b8777..de63b7967 100644 --- a/source/slang-capture-replay/slang-module.h +++ b/source/slang-capture-replay/slang-module.h @@ -1,9 +1,9 @@ #ifndef SLANG_MODULE_H #define SLANG_MODULE_H -#include "../../slang-com-ptr.h" -#include "../../slang.h" -#include "../../slang-com-helper.h" +#include "slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" #include "../core/slang-smart-pointer.h" #include "../slang/slang-compiler.h" #include "slang-entrypoint.h" diff --git a/source/slang-capture-replay/slang-session.h b/source/slang-capture-replay/slang-session.h index 161500172..23f818695 100644 --- a/source/slang-capture-replay/slang-session.h +++ b/source/slang-capture-replay/slang-session.h @@ -1,9 +1,9 @@ #ifndef SLANG_SESSION_H #define SLANG_SESSION_H -#include "../../slang-com-ptr.h" -#include "../../slang.h" -#include "../../slang-com-helper.h" +#include "slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" #include "../core/slang-smart-pointer.h" #include "../core/slang-dictionary.h" #include "../slang/slang-compiler.h" diff --git a/source/slang-capture-replay/slang-type-conformance.h b/source/slang-capture-replay/slang-type-conformance.h index a37fd8daf..2c36abbfb 100644 --- a/source/slang-capture-replay/slang-type-conformance.h +++ b/source/slang-capture-replay/slang-type-conformance.h @@ -1,9 +1,9 @@ #ifndef SLANG_TYPE_CONFORMANCE_H #define SLANG_TYPE_CONFORMANCE_H -#include "../../slang-com-ptr.h" -#include "../../slang.h" -#include "../../slang-com-helper.h" +#include "slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" #include "../core/slang-smart-pointer.h" #include "../core/slang-dictionary.h" #include "../slang/slang-compiler.h" diff --git a/source/slang-glslang/slang-glslang.cpp b/source/slang-glslang/slang-glslang.cpp index 32db16259..cdbc95031 100644 --- a/source/slang-glslang/slang-glslang.cpp +++ b/source/slang-glslang/slang-glslang.cpp @@ -13,7 +13,7 @@ #include "glslang/MachineIndependent/localintermediate.h" -#include "../../slang.h" +#include "slang.h" #include "spirv-tools/optimizer.hpp" #include "spirv-tools/libspirv.h" diff --git a/source/slang-llvm/slang-llvm-filecheck.cpp b/source/slang-llvm/slang-llvm-filecheck.cpp index bd71eac05..524950837 100644 --- a/source/slang-llvm/slang-llvm-filecheck.cpp +++ b/source/slang-llvm/slang-llvm-filecheck.cpp @@ -5,9 +5,9 @@ #include <llvm/Support/raw_ostream.h> #include <llvm/FileCheck/FileCheck.h> -#include <slang.h> -#include <slang-com-helper.h> -#include <slang-com-ptr.h> +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include <core/slang-com-object.h> #include <tools/slang-test/filecheck.h> diff --git a/source/slang-llvm/slang-llvm.cpp b/source/slang-llvm/slang-llvm.cpp index 8ea88f09c..0c14fbeb6 100644 --- a/source/slang-llvm/slang-llvm.cpp +++ b/source/slang-llvm/slang-llvm.cpp @@ -57,9 +57,9 @@ // Slang -#include <slang.h> -#include <slang-com-helper.h> -#include <slang-com-ptr.h> +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include <core/slang-list.h> #include <core/slang-string.h> diff --git a/source/slang/slang-artifact-output-util.h b/source/slang/slang-artifact-output-util.h index 3c8b2cfc7..13682c579 100644 --- a/source/slang/slang-artifact-output-util.h +++ b/source/slang/slang-artifact-output-util.h @@ -6,7 +6,7 @@ #include "../compiler-core/slang-artifact.h" #include "../compiler-core/slang-diagnostic-sink.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" namespace Slang { diff --git a/source/slang/slang-ast-reflect.cpp b/source/slang/slang-ast-reflect.cpp index 66e57a744..a91ec0618 100644 --- a/source/slang/slang-ast-reflect.cpp +++ b/source/slang/slang-ast-reflect.cpp @@ -1,4 +1,4 @@ -#include "../../slang.h" +#include "slang.h" #include "slang-ast-reflect.h" diff --git a/source/slang/slang-ast-support-types.h b/source/slang/slang-ast-support-types.h index 76c638693..f709345d5 100644 --- a/source/slang/slang-ast-support-types.h +++ b/source/slang/slang-ast-support-types.h @@ -9,7 +9,7 @@ #include "slang-profile.h" #include "slang-type-system-shared.h" -#include "../../slang.h" +#include "slang.h" #include "../core/slang-semantic-version.h" diff --git a/source/slang/slang-compiler-options.h b/source/slang/slang-compiler-options.h index e1ce21789..dae6d49e5 100644 --- a/source/slang/slang-compiler-options.h +++ b/source/slang/slang-compiler-options.h @@ -1,7 +1,7 @@ #ifndef SLANG_COMPILER_OPTIONS_H #define SLANG_COMPILER_OPTIONS_H -#include "../../slang.h" +#include "slang.h" #include "../core/slang-basic.h" #include "../core/slang-crypto.h" #include "slang-generated-capability-defs.h" diff --git a/source/slang/slang-compiler.h b/source/slang/slang-compiler.h index e9660f7ed..35b2fcf44 100755 --- a/source/slang/slang-compiler.h +++ b/source/slang/slang-compiler.h @@ -21,7 +21,7 @@ #include "../core/slang-file-system.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "slang-capability.h" #include "slang-diagnostics.h" @@ -35,7 +35,7 @@ #include "../compiler-core/slang-artifact-representation-impl.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/slang/slang-content-assist-info.h b/source/slang/slang-content-assist-info.h index 8f4105184..5487a1f69 100644 --- a/source/slang/slang-content-assist-info.h +++ b/source/slang/slang-content-assist-info.h @@ -3,7 +3,7 @@ #pragma once #include "slang-syntax.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/slang/slang-diagnostics.h b/source/slang/slang-diagnostics.h index 299b63827..202ee0cf4 100644 --- a/source/slang/slang-diagnostics.h +++ b/source/slang/slang-diagnostics.h @@ -8,7 +8,7 @@ #include "../compiler-core/slang-diagnostic-sink.h" #include "../compiler-core/slang-token.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/slang/slang-ir-inline.h b/source/slang/slang-ir-inline.h index 1b37a28ae..acca0a61b 100644 --- a/source/slang/slang-ir-inline.h +++ b/source/slang/slang-ir-inline.h @@ -1,7 +1,7 @@ // slang-ir-inline.h #pragma once -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "core/slang-basic.h" namespace Slang diff --git a/source/slang/slang-ir-obfuscate-loc.cpp b/source/slang/slang-ir-obfuscate-loc.cpp index 79497e7a3..be648596e 100644 --- a/source/slang/slang-ir-obfuscate-loc.cpp +++ b/source/slang/slang-ir-obfuscate-loc.cpp @@ -1,7 +1,7 @@ // slang-ir-obfuscate-loc.cpp #include "slang-ir-obfuscate-loc.h" -#include "../../slang.h" +#include "slang.h" #include "../core/slang-random-generator.h" #include "../core/slang-stable-hash.h" diff --git a/source/slang/slang-ir-operator-shift-overflow.cpp b/source/slang/slang-ir-operator-shift-overflow.cpp index 33ee53262..5f829f05a 100644 --- a/source/slang/slang-ir-operator-shift-overflow.cpp +++ b/source/slang/slang-ir-operator-shift-overflow.cpp @@ -1,7 +1,7 @@ // slang-ir-operator-shift-overflow.cpp #include "slang-ir-operator-shift-overflow.h" -#include "../../slang.h" +#include "slang.h" #include "slang-ir.h" #include "slang-ir-insts.h" #include "slang-ir-layout.h" diff --git a/source/slang/slang-language-server-auto-format.h b/source/slang/slang-language-server-auto-format.h index e2cf89a25..95cc02764 100644 --- a/source/slang/slang-language-server-auto-format.h +++ b/source/slang/slang-language-server-auto-format.h @@ -1,6 +1,6 @@ #pragma once -#include "../../slang.h" +#include "slang.h" #include "../core/slang-basic.h" #include "slang-workspace-version.h" diff --git a/source/slang/slang-language-server-document-symbols.h b/source/slang/slang-language-server-document-symbols.h index 65e84a6b2..6367c199b 100644 --- a/source/slang/slang-language-server-document-symbols.h +++ b/source/slang/slang-language-server-document-symbols.h @@ -1,6 +1,6 @@ #pragma once -#include "../../slang.h" +#include "slang.h" #include "../core/slang-basic.h" #include "slang-ast-all.h" #include "slang-syntax.h" diff --git a/source/slang/slang-language-server-inlay-hints.h b/source/slang/slang-language-server-inlay-hints.h index 50ea67c45..b7dfef98b 100644 --- a/source/slang/slang-language-server-inlay-hints.h +++ b/source/slang/slang-language-server-inlay-hints.h @@ -1,6 +1,6 @@ #pragma once -#include "../../slang.h" +#include "slang.h" #include "../core/slang-basic.h" #include "slang-ast-all.h" #include "slang-syntax.h" diff --git a/source/slang/slang-language-server-semantic-tokens.h b/source/slang/slang-language-server-semantic-tokens.h index 8a736345f..b29da5375 100644 --- a/source/slang/slang-language-server-semantic-tokens.h +++ b/source/slang/slang-language-server-semantic-tokens.h @@ -1,6 +1,6 @@ #pragma once -#include "../../slang.h" +#include "slang.h" #include "../core/slang-basic.h" #include "slang-ast-all.h" #include "slang-syntax.h" diff --git a/source/slang/slang-language-server.cpp b/source/slang/slang-language-server.cpp index 8f71666dd..09b14932c 100644 --- a/source/slang/slang-language-server.cpp +++ b/source/slang/slang-language-server.cpp @@ -13,7 +13,7 @@ #include "../core/slang-char-util.h" #include "../core/slang-string-util.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../compiler-core/slang-json-native.h" #include "../compiler-core/slang-json-rpc-connection.h" #include "../compiler-core/slang-language-server-protocol.h" diff --git a/source/slang/slang-language-server.h b/source/slang/slang-language-server.h index 956ad9769..0a157819d 100644 --- a/source/slang/slang-language-server.h +++ b/source/slang/slang-language-server.h @@ -1,6 +1,6 @@ #pragma once #include <chrono> -#include "../../slang.h" +#include "slang.h" #include "../core/slang-range.h" #include "../compiler-core/slang-json-rpc.h" #include "../compiler-core/slang-json-rpc-connection.h" diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp index d8d573d63..b86b7b177 100644 --- a/source/slang/slang-lower-to-ir.cpp +++ b/source/slang/slang-lower-to-ir.cpp @@ -1,7 +1,7 @@ // lower.cpp #include "slang-lower-to-ir.h" -#include "../../slang.h" +#include "slang.h" #include "../core/slang-random-generator.h" #include "../core/slang-hash.h" diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp index 87c9b1192..4670af9df 100644 --- a/source/slang/slang-options.cpp +++ b/source/slang/slang-options.cpp @@ -5,7 +5,7 @@ #include "slang-options.h" -#include "../../slang.h" +#include "slang.h" #include "slang-compiler.h" #include "slang-profile.h" diff --git a/source/slang/slang-parameter-binding.cpp b/source/slang/slang-parameter-binding.cpp index 046c35ef9..8b15126db 100644 --- a/source/slang/slang-parameter-binding.cpp +++ b/source/slang/slang-parameter-binding.cpp @@ -10,7 +10,7 @@ #include "slang-ir-string-hash.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/slang/slang-parameter-binding.h b/source/slang/slang-parameter-binding.h index e2530e34e..3bf44f90d 100644 --- a/source/slang/slang-parameter-binding.h +++ b/source/slang/slang-parameter-binding.h @@ -4,7 +4,7 @@ #include "../core/slang-basic.h" #include "slang-syntax.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/slang/slang-profile.h b/source/slang/slang-profile.h index 55855b91d..d07a4555f 100644 --- a/source/slang/slang-profile.h +++ b/source/slang/slang-profile.h @@ -2,7 +2,7 @@ #define SLANG_PROFILE_H_INCLUDED #include "../core/slang-basic.h" -#include "../../slang.h" +#include "slang.h" #include "slang-capability.h" namespace Slang diff --git a/source/slang/slang-ref-object-reflect.cpp b/source/slang/slang-ref-object-reflect.cpp index f07dcbba7..59c948d38 100644 --- a/source/slang/slang-ref-object-reflect.cpp +++ b/source/slang/slang-ref-object-reflect.cpp @@ -1,4 +1,4 @@ -#include "../../slang.h" +#include "slang.h" #include "slang-ref-object-reflect.h" diff --git a/source/slang/slang-reflection-api.cpp b/source/slang/slang-reflection-api.cpp index 0642caeb6..d0d09f814 100644 --- a/source/slang/slang-reflection-api.cpp +++ b/source/slang/slang-reflection-api.cpp @@ -3,7 +3,7 @@ #include "../core/slang-basic.h" #include "slang-syntax.h" -#include "../../slang.h" +#include "slang.h" #include "slang-compiler.h" #include "slang-type-layout.h" diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp index 3c8b48e00..dbc358c18 100644 --- a/source/slang/slang-stdlib.cpp +++ b/source/slang/slang-stdlib.cpp @@ -349,7 +349,7 @@ namespace Slang { const String path = getStdlibPath(); StringBuilder sb; -#include "glsl.meta.slang.h" + #include "glsl.meta.slang.h" glslLibraryCode = StringBlob::moveCreate(sb); } return glslLibraryCode; diff --git a/source/slang/slang-type-layout.h b/source/slang/slang-type-layout.h index f29a38435..37c0cd1e7 100644 --- a/source/slang/slang-type-layout.h +++ b/source/slang/slang-type-layout.h @@ -6,7 +6,7 @@ #include "slang-profile.h" #include "slang-syntax.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/slang/slang-type-system-shared.h b/source/slang/slang-type-system-shared.h index 1c8dd56aa..2f467a05a 100644 --- a/source/slang/slang-type-system-shared.h +++ b/source/slang/slang-type-system-shared.h @@ -1,7 +1,7 @@ #ifndef SLANG_TYPE_SYSTEM_SHARED_H #define SLANG_TYPE_SYSTEM_SHARED_H -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/source/slang/slang-value-reflect.cpp b/source/slang/slang-value-reflect.cpp index 3c19deba4..bcfde06e5 100644 --- a/source/slang/slang-value-reflect.cpp +++ b/source/slang/slang-value-reflect.cpp @@ -1,4 +1,4 @@ -#include "../../slang.h" +#include "slang.h" #include "slang-value-reflect.h" diff --git a/source/slang/slang-workspace-version.h b/source/slang/slang-workspace-version.h index 28d6e1fe2..44ab6b43c 100644 --- a/source/slang/slang-workspace-version.h +++ b/source/slang/slang-workspace-version.h @@ -1,8 +1,8 @@ #pragma once -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" -#include "../../slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" +#include "slang.h" #include "../core/slang-basic.h" #include "../core/slang-com-object.h" #include "../compiler-core/slang-language-server-protocol.h" diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp index 9827f9c5c..f28d3cdeb 100644 --- a/source/slang/slang.cpp +++ b/source/slang/slang.cpp @@ -1,4 +1,4 @@ -#include "../../slang.h" +#include "slang.h" #include "../core/slang-io.h" #include "../core/slang-string-util.h" diff --git a/source/slangc/main.cpp b/source/slangc/main.cpp index b86472617..e69a6655d 100644 --- a/source/slangc/main.cpp +++ b/source/slangc/main.cpp @@ -1,6 +1,6 @@ // main.cpp -#include "../../slang.h" +#include "slang.h" SLANG_API void spSetCommandLineCompilerMode(SlangCompileRequest* request); diff --git a/tools/gfx-unit-test/gfx-test-texture-util.cpp b/tools/gfx-unit-test/gfx-test-texture-util.cpp index 3b3a1a760..21e82ab22 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 "tools/unit-test/slang-unit-test.h" -#include <slang-com-ptr.h> +#include "slang-com-ptr.h" #include <stdlib.h> #include <stdio.h> diff --git a/tools/gfx-unit-test/gfx-test-util.cpp b/tools/gfx-unit-test/gfx-test-util.cpp index fe06a1745..3ca67e67b 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 "tools/unit-test/slang-unit-test.h" -#include <slang-com-ptr.h> +#include "slang-com-ptr.h" #define GFX_ENABLE_RENDERDOC_INTEGRATION 0 #define GFX_ENABLE_SPIRV_DEBUG 0 diff --git a/tools/gfx/renderer-shared.cpp b/tools/gfx/renderer-shared.cpp index d4fda3183..65a14c8cb 100644 --- a/tools/gfx/renderer-shared.cpp +++ b/tools/gfx/renderer-shared.cpp @@ -6,7 +6,7 @@ #include "../../source/core/slang-stable-hash.h" #include "../../source/core/slang-file-system.h" -#include "../../slang.h" +#include "slang.h" using namespace Slang; diff --git a/tools/render-test/diagnostics.h b/tools/render-test/diagnostics.h index 08ba28e27..fa4c8a389 100644 --- a/tools/render-test/diagnostics.h +++ b/tools/render-test/diagnostics.h @@ -7,7 +7,7 @@ #include "../../source/compiler-core/slang-source-loc.h" #include "../../source/compiler-core/slang-diagnostic-sink.h" -#include "../../slang.h" +#include "slang.h" namespace Slang { diff --git a/tools/render-test/options.h b/tools/render-test/options.h index 6ea166833..1400f0129 100644 --- a/tools/render-test/options.h +++ b/tools/render-test/options.h @@ -7,14 +7,14 @@ #define SLANG_HANDLE_RESULT_FAIL(x) assert(!"failure") #endif -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../../source/core/slang-writer.h" #include "../../source/core/slang-process-util.h" #include "../../source/compiler-core/slang-command-line-args.h" -#include "../../slang-gfx.h" +#include "slang-gfx.h" namespace renderer_test { diff --git a/tools/render-test/slang-support.h b/tools/render-test/slang-support.h index 6eef93edc..0ed6216a9 100644 --- a/tools/render-test/slang-support.h +++ b/tools/render-test/slang-support.h @@ -3,7 +3,7 @@ #include "slang-gfx.h" -#include <slang.h> +#include "slang.h" #include "shader-input-layout.h" #include "options.h" diff --git a/tools/slang-cpp-extractor/cpp-extractor-main.cpp b/tools/slang-cpp-extractor/cpp-extractor-main.cpp index 2bc0596e1..e3bb041be 100644 --- a/tools/slang-cpp-extractor/cpp-extractor-main.cpp +++ b/tools/slang-cpp-extractor/cpp-extractor-main.cpp @@ -5,7 +5,7 @@ #include <string.h> #include "../../source/core/slang-secure-crt.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../../source/core/slang-list.h" #include "../../source/core/slang-string.h" diff --git a/tools/slang-cpp-extractor/macro-writer.cpp b/tools/slang-cpp-extractor/macro-writer.cpp index 24d95850a..285a91851 100644 --- a/tools/slang-cpp-extractor/macro-writer.cpp +++ b/tools/slang-cpp-extractor/macro-writer.cpp @@ -1,6 +1,6 @@ #include "macro-writer.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../../source/core/slang-list.h" #include "../../source/core/slang-string.h" diff --git a/tools/slang-profile/slang-profile-main.cpp b/tools/slang-profile/slang-profile-main.cpp index 7cf6cb6f8..d23a7ba10 100644 --- a/tools/slang-profile/slang-profile-main.cpp +++ b/tools/slang-profile/slang-profile-main.cpp @@ -5,7 +5,7 @@ #include "../../source/core/slang-process-util.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../../source/core/slang-string-util.h" diff --git a/tools/slang-reflection-test/slang-reflection-test-main.cpp b/tools/slang-reflection-test/slang-reflection-test-main.cpp index 4b5faae6b..be48d8e92 100644 --- a/tools/slang-reflection-test/slang-reflection-test-main.cpp +++ b/tools/slang-reflection-test/slang-reflection-test-main.cpp @@ -5,8 +5,8 @@ #include <stdlib.h> #include <string.h> -#include <slang.h> -#include <slang-com-helper.h> +#include "slang.h" +#include "slang-com-helper.h" #include "../../source/core/slang-string-escape-util.h" #include "../../source/core/slang-char-util.h" diff --git a/tools/slang-test/parse-diagnostic-util.cpp b/tools/slang-test/parse-diagnostic-util.cpp index 1141f81c4..b0f13b4ee 100644 --- a/tools/slang-test/parse-diagnostic-util.cpp +++ b/tools/slang-test/parse-diagnostic-util.cpp @@ -5,7 +5,7 @@ #include "../../source/core/slang-hex-dump-util.h" #include "../../source/core/slang-type-text-util.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../../source/core/slang-string-util.h" #include "../../source/core/slang-byte-encode-util.h" diff --git a/tools/slang-test/parse-diagnostic-util.h b/tools/slang-test/parse-diagnostic-util.h index 2ad7a7911..44707b9ff 100644 --- a/tools/slang-test/parse-diagnostic-util.h +++ b/tools/slang-test/parse-diagnostic-util.h @@ -10,7 +10,7 @@ #include "../../source/compiler-core/slang-artifact-diagnostic-util.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" struct ParseDiagnosticUtil { diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index 9463cbc23..f9e07bdc9 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -11,7 +11,7 @@ #include "../../source/compiler-core/slang-artifact-desc-util.h" #include "../../source/compiler-core/slang-artifact-helper.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../../source/core/slang-string-util.h" #include "../../source/core/slang-string-escape-util.h" @@ -1629,6 +1629,17 @@ TestResult runExecutableTest(TestContext* context, TestInput& input) String modulePath = Path::combine( Path::getParentDirectory(Path::getExecutablePath()), Path::getFileNameWithoutExt(filePath)); + // String testRoot + // for(;;) + // { + // String testRoot = Path::getParentDirectory(filePath); + // if (testRoot == "") + // { + // break; + // } + // } + // printf("test folder = %s\n", testRoot.begin()); + String moduleExePath; { StringBuilder buf; @@ -1651,6 +1662,8 @@ TestResult runExecutableTest(TestContext* context, TestInput& input) args.add(moduleExePath); args.add("-target"); args.add("exe"); + args.add("-Xgenericcpp"); + args.add("-I./include"); for (auto arg : args) { // If unescaping is needed, do it diff --git a/tools/slang-test/test-context.h b/tools/slang-test/test-context.h index 7006ec905..b42ac1ec9 100644 --- a/tools/slang-test/test-context.h +++ b/tools/slang-test/test-context.h @@ -15,7 +15,7 @@ #include "../../source/compiler-core/slang-json-rpc-connection.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "filecheck.h" 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 57209fbde..82aa14aa4 100644 --- a/tools/slang-unit-test/unit-test-com-host-callable.cpp +++ b/tools/slang-unit-test/unit-test-com-host-callable.cpp @@ -7,9 +7,9 @@ #include "tools/unit-test/slang-unit-test.h" -#include "../../slang.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../../source/core/slang-list.h" 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 468b7d986..540036650 100644 --- a/tools/slang-unit-test/unit-test-default-matrix-layout.cpp +++ b/tools/slang-unit-test/unit-test-default-matrix-layout.cpp @@ -5,9 +5,9 @@ #include "tools/unit-test/slang-unit-test.h" -#include "../../slang.h" -#include "../../slang-com-helper.h" -#include "../../slang-com-ptr.h" +#include "slang.h" +#include "slang-com-helper.h" +#include "slang-com-ptr.h" #include "../../source/core/slang-list.h" 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 371c8ae81..423b83b65 100644 --- a/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp +++ b/tools/slang-unit-test/unit-test-find-check-entrypoint.cpp @@ -1,12 +1,12 @@ // unit-test-translation-unit-import.cpp -#include "../../slang.h" +#include "slang.h" #include <stdio.h> #include <stdlib.h> #include "tools/unit-test/slang-unit-test.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "../../source/core/slang-io.h" #include "../../source/core/slang-process.h" 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 87be156db..ee6ba3516 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,6 +1,6 @@ // unit-test-find-type-by-name.cpp -#include "../../slang.h" +#include "slang.h" #include <stdio.h> #include <stdlib.h> diff --git a/tools/slang-unit-test/unit-test-function-reflection.cpp b/tools/slang-unit-test/unit-test-function-reflection.cpp index ddbfa439b..ddcb81adc 100644 --- a/tools/slang-unit-test/unit-test-function-reflection.cpp +++ b/tools/slang-unit-test/unit-test-function-reflection.cpp @@ -1,12 +1,12 @@ // unit-test-translation-unit-import.cpp -#include "../../slang.h" +#include "slang.h" #include <stdio.h> #include <stdlib.h> #include "tools/unit-test/slang-unit-test.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "../../source/core/slang-io.h" #include "../../source/core/slang-process.h" 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 a98510fd5..7cb51c91b 100644 --- a/tools/slang-unit-test/unit-test-get-target-code.cpp +++ b/tools/slang-unit-test/unit-test-get-target-code.cpp @@ -1,12 +1,12 @@ // unit-test-translation-unit-import.cpp -#include "../../slang.h" +#include "slang.h" #include <stdio.h> #include <stdlib.h> #include "tools/unit-test/slang-unit-test.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "../../source/core/slang-io.h" #include "../../source/core/slang-process.h" 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 b8108644e..3b7f90c00 100644 --- a/tools/slang-unit-test/unit-test-translation-unit-import.cpp +++ b/tools/slang-unit-test/unit-test-translation-unit-import.cpp @@ -1,12 +1,12 @@ // unit-test-translation-unit-import.cpp -#include "../../slang.h" +#include "slang.h" #include <stdio.h> #include <stdlib.h> #include "tools/unit-test/slang-unit-test.h" -#include "../../slang-com-ptr.h" +#include "slang-com-ptr.h" #include "../../source/core/slang-io.h" #include "../../source/core/slang-process.h" diff --git a/tools/test-process/test-process-main.cpp b/tools/test-process/test-process-main.cpp index 9729c24b7..ea8f30c11 100644 --- a/tools/test-process/test-process-main.cpp +++ b/tools/test-process/test-process-main.cpp @@ -5,7 +5,7 @@ #include <string.h> -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../../source/core/slang-string.h" #include "../../source/core/slang-io.h" diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp index dc6a7916d..750fb7faf 100644 --- a/tools/test-server/test-server-main.cpp +++ b/tools/test-server/test-server-main.cpp @@ -6,7 +6,7 @@ #include "../../source/core/slang-secure-crt.h" -#include "../../slang-com-helper.h" +#include "slang-com-helper.h" #include "../../source/core/slang-string.h" #include "../../source/core/slang-io.h" diff --git a/tools/vk-pipeline-create/main.cpp b/tools/vk-pipeline-create/main.cpp index 893eecfd1..f9acd69ac 100644 --- a/tools/vk-pipeline-create/main.cpp +++ b/tools/vk-pipeline-create/main.cpp @@ -3,8 +3,8 @@ // This tools reads a gfx pipeline dump file and replays the pipeline creation to trigger // shader compilation in the driver. // -#include <slang.h> -#include <slang-com-ptr.h> +#include "slang.h" +#include "slang-com-ptr.h" #include "examples/hello-world/vulkan-api.h" #include "../../source/core/slang-string-util.h" |