From 7b570feed42976a6e787d79a70aaf8e667745e58 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Thu, 14 Nov 2024 12:34:18 +0800 Subject: Correct include dir for libslang (#5539) This stops adding the repo root to the include path for anything linking with slang. This enabled a bunch of convenient includes, but might lead to confusing behavior for anyone including slang. Not to mention differences including it from an install vs source. Co-authored-by: Yong He --- tools/gfx-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 +++--- tools/gfx-unit-test/existing-device-handle-test.cpp | 6 +++--- tools/gfx-unit-test/format-unit-tests.cpp | 6 +++--- tools/gfx-unit-test/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 +++--- tools/gfx-unit-test/get-supported-resource-states-test.cpp | 6 +++--- tools/gfx-unit-test/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 +++--- 38 files changed, 129 insertions(+), 129 deletions(-) (limited to 'tools/gfx-unit-test') diff --git a/tools/gfx-unit-test/buffer-barrier-test.cpp b/tools/gfx-unit-test/buffer-barrier-test.cpp index 2ee78fdb1..2d53ac13f 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 ed9d12f0d..3e1efae0a 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 da8357591..ba1da2283 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 341593d04..c89748229 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 babe0bcf1..f6f85f9f4 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 a4e743196..f25aa5d5f 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 e971100b9..8b7a84ec2 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 3b7695ccc..56741854e 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 83c3f400d..97bb413fd 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 c916c0d6d..b1e7ebc04 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 f8b3850a1..5e72c41d9 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 9870dfa1f..844372eaa 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 2cd2ba658..4a7412ddc 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 bb2c9c5eb..7e6d738ee 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 2751a2a20..6a98eec43 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 79343680f..2bbe65416 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 51b1feb1f..558670162 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 adb1a1df1..636a4e2e4 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 047ecd3bc..47dbbab2d 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 d341e5dc0..244991148 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 590db576e..64f189162 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 81c738126..8f4bcca01 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 9c91a7ca3..c7ce40d34 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 e904226ae..1201be261 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 f5c478b4d..f5d576a23 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 1c10f759b..8c22a7c84 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 2ecc412c4..3d5e5e565 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 0e7fd2765..1506128ad 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 ea25b609f..dd318c7c4 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 fce4cc0da..c3bd95382 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 f933ec48a..a06a07ef5 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 720aa0a2c..67efe0c32 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 8ee8d9015..69767b3d2 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 4355dda99..dbb0be3be 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 ee8108c39..f017c959e 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 269f08735..23f39fd8a 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 89342f9cf..b581fd3d7 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 23fd70544..d0d1789ed 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; -- cgit v1.2.3