Skip to content

Commit 7b570fe

Browse files
expipiplus1csyonghe
expipiplus1
and
csyonghe
authored
Correct include dir for libslang (shader-slang#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 <yonghe@outlook.com>
1 parent fdf106b commit 7b570fe

File tree

108 files changed

+240
-229
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+240
-229
lines changed

‎cmake/LLVM.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ function(fetch_or_build_slang_llvm)
7979
LINK_WITH_PRIVATE core compiler-core llvm-dep clang-dep
8080
# We include slang.h, but don't need to link with it
8181
INCLUDE_FROM_PRIVATE slang
82+
# We include tools/slang-test/filecheck.h, but don't need to link
83+
# with it and it might not be a target if SLANG_ENABLE_TESTS is
84+
# false, so just include the directory manually here
85+
INCLUDE_DIRECTORIES_PRIVATE ${slang_SOURCE_DIR}/tools
8286
# This uses the SLANG_DLL_EXPORT macro from slang.h, so make sure to set
8387
# SLANG_DYNAMIC and SLANG_DYNAMIC_EXPORT
8488
EXPORT_MACRO_PREFIX SLANG

‎examples/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ if(SLANG_ENABLE_EXAMPLES)
6464
slang
6565
gfx
6666
platform
67+
stb
6768
$<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver>
6869
FOLDER examples
6970
)

‎examples/autodiff-texture/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
#include "core/slang-basic.h"
12
#include "examples/example-base/example-base.h"
23
#include "gfx-util/shader-cursor.h"
4+
#include "platform/vector-math.h"
5+
#include "platform/window.h"
36
#include "slang-com-ptr.h"
47
#include "slang-gfx.h"
58
#include "slang.h"
6-
#include "source/core/slang-basic.h"
7-
#include "tools/platform/vector-math.h"
8-
#include "tools/platform/window.h"
99

1010
using namespace gfx;
1111
using namespace Slang;

‎examples/example-base/example-base.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#endif
88

99
#define STB_IMAGE_IMPLEMENTATION
10-
#include "external/stb/stb_image.h"
10+
#include "stb_image.h"
1111

1212
using namespace Slang;
1313
using namespace gfx;

‎examples/example-base/example-base.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#pragma once
22

3+
#include "core/slang-basic.h"
4+
#include "core/slang-io.h"
5+
#include "platform/window.h"
36
#include "slang-gfx.h"
4-
#include "source/core/slang-basic.h"
5-
#include "source/core/slang-io.h"
67
#include "test-base.h"
7-
#include "tools/platform/window.h"
88

99
#ifdef _WIN32
1010
void _Win32OutputDebugString(const char* str);

‎examples/example-base/test-base.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
22

3+
#include "core/slang-string-util.h"
34
#include "slang-com-ptr.h"
45
#include "slang.h"
5-
#include "source/core/slang-string-util.h"
66

77
using Slang::ComPtr;
88

‎examples/gpu-printing/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
#include <string>
66
using Slang::ComPtr;
77

8+
#include "core/slang-basic.h"
89
#include "examples/example-base/example-base.h"
910
#include "gfx-util/shader-cursor.h"
1011
#include "gpu-printing.h"
12+
#include "platform/window.h"
1113
#include "slang-gfx.h"
12-
#include "source/core/slang-basic.h"
13-
#include "tools/platform/window.h"
1414

1515
using namespace gfx;
1616

‎examples/hello-world/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
// The goal is to demonstrate how to use the Slang API to cross compile
88
// shader code.
99
//
10+
#include "core/slang-string-util.h"
1011
#include "examples/example-base/example-base.h"
1112
#include "examples/example-base/test-base.h"
1213
#include "slang-com-ptr.h"
1314
#include "slang.h"
14-
#include "source/core/slang-string-util.h"
1515
#include "vulkan-api.h"
1616

1717
using Slang::ComPtr;

‎examples/model-viewer/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
// and parameter binding.
2626
//
2727
#include "examples/example-base/example-base.h"
28+
#include "gfx-util/shader-cursor.h"
29+
#include "platform/gui.h"
30+
#include "platform/model.h"
31+
#include "platform/vector-math.h"
32+
#include "platform/window.h"
2833
#include "slang-gfx.h"
29-
#include "tools/gfx-util/shader-cursor.h"
30-
#include "tools/platform/gui.h"
31-
#include "tools/platform/model.h"
32-
#include "tools/platform/vector-math.h"
33-
#include "tools/platform/window.h"
3434

3535
#include <map>
3636
#include <sstream>

‎examples/nv-aftermath-example/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
#include "../../source/core/slang-io.h"
44
#include "GFSDK_Aftermath.h"
55
#include "GFSDK_Aftermath_GpuCrashDump.h"
6+
#include "core/slang-basic.h"
67
#include "examples/example-base/example-base.h"
78
#include "gfx-util/shader-cursor.h"
9+
#include "platform/window.h"
810
#include "slang-com-ptr.h"
911
#include "slang-gfx.h"
1012
#include "slang.h"
11-
#include "source/core/slang-basic.h"
12-
#include "tools/platform/window.h"
1313

1414
using namespace gfx;
1515
using namespace Slang;

‎examples/platform-test/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "examples/example-base/example-base.h"
2+
#include "platform/window.h"
23
#include "slang.h"
3-
#include "tools/platform/window.h"
44

55
using namespace gfx;
66
using namespace Slang;

‎examples/ray-tracing-pipeline/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// This file implements an example of hardware ray-tracing using
44
// Slang shaders and the `gfx` graphics API.
55

6+
#include "core/slang-basic.h"
67
#include "examples/example-base/example-base.h"
78
#include "gfx-util/shader-cursor.h"
9+
#include "platform/vector-math.h"
10+
#include "platform/window.h"
811
#include "slang-com-ptr.h"
912
#include "slang-gfx.h"
1013
#include "slang.h"
11-
#include "source/core/slang-basic.h"
12-
#include "tools/platform/vector-math.h"
13-
#include "tools/platform/window.h"
1414

1515
using namespace gfx;
1616
using namespace Slang;

‎examples/ray-tracing/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// This file implements an example of hardware ray-tracing using
44
// Slang shaders and the `gfx` graphics API.
55

6+
#include "core/slang-basic.h"
67
#include "examples/example-base/example-base.h"
78
#include "gfx-util/shader-cursor.h"
9+
#include "platform/vector-math.h"
10+
#include "platform/window.h"
811
#include "slang-com-ptr.h"
912
#include "slang-gfx.h"
1013
#include "slang.h"
11-
#include "source/core/slang-basic.h"
12-
#include "tools/platform/vector-math.h"
13-
#include "tools/platform/window.h"
1414

1515
using namespace gfx;
1616
using namespace Slang;

‎examples/shader-object/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#include "slang.h"
1313
using Slang::ComPtr;
1414

15+
#include "core/slang-basic.h"
1516
#include "examples/example-base/example-base.h"
1617
#include "gfx-util/shader-cursor.h"
1718
#include "slang-gfx.h"
18-
#include "source/core/slang-basic.h"
1919

2020
using namespace gfx;
2121

‎examples/shader-toy/main.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ using Slang::ComPtr;
1919
// this layer is *not* required or assumed when using the Slang language,
2020
// compiler, and API.
2121
//
22+
#include "core/slang-basic.h"
2223
#include "examples/example-base/example-base.h"
24+
#include "gfx-util/shader-cursor.h"
25+
#include "platform/performance-counter.h"
26+
#include "platform/window.h"
2327
#include "slang-gfx.h"
24-
#include "source/core/slang-basic.h"
25-
#include "tools/gfx-util/shader-cursor.h"
26-
#include "tools/platform/performance-counter.h"
27-
#include "tools/platform/window.h"
2828

2929
#include <chrono>
3030

‎examples/triangle/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
// with Slang may depend on an application/engine making certain
3333
// design choices in their abstraction layer.
3434
//
35+
#include "core/slang-basic.h"
3536
#include "examples/example-base/example-base.h"
3637
#include "gfx-util/shader-cursor.h"
38+
#include "platform/window.h"
3739
#include "slang-com-ptr.h"
3840
#include "slang-gfx.h"
39-
#include "source/core/slang-basic.h"
40-
#include "tools/platform/window.h"
4141

4242
using namespace gfx;
4343
using namespace Slang;

‎external/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,12 @@ endif()
9191
add_library(imgui INTERFACE)
9292
target_include_directories(imgui INTERFACE "${CMAKE_CURRENT_LIST_DIR}/imgui")
9393

94+
# stb
95+
add_library(stb INTERFACE)
96+
target_include_directories(stb INTERFACE "${CMAKE_CURRENT_LIST_DIR}/stb")
97+
98+
# slang-rhi
9499
if(SLANG_ENABLE_SLANG_RHI)
95-
# slang-rhi
96100
set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/bin)
97101
set(SLANG_RHI_SLANG_INCLUDE_DIR ${slang_SOURCE_DIR}/include)
98102
set(SLANG_RHI_SLANG_BINARY_DIR ${CMAKE_BINARY_DIR})

‎source/slang-llvm/slang-llvm-filecheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <llvm/ADT/SmallString.h>
1010
#include <llvm/FileCheck/FileCheck.h>
1111
#include <llvm/Support/raw_ostream.h>
12-
#include <tools/slang-test/filecheck.h>
12+
#include <slang-test/filecheck.h>
1313

1414
namespace slang_llvm
1515
{

‎source/slang/CMakeLists.txt

+1-6
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,7 @@ set(slang_link_args
224224
slang-lookup-tables
225225
SPIRV-Headers
226226
)
227-
set(slang_interface_args
228-
# slang.h is in the project root, so include that directory in the interface
229-
# for slang
230-
INCLUDE_DIRECTORIES_PUBLIC
231-
${slang_SOURCE_DIR}
232-
)
227+
set(slang_interface_args INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/include)
233228
set(slang_public_lib_args
234229
PUBLIC_HEADERS
235230
${slang_SOURCE_DIR}/include/slang*.h

‎tools/CMakeLists.txt

+9-2
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ if(SLANG_ENABLE_GFX)
9898
LINK_WITH_PRIVATE
9999
core
100100
imgui
101+
stb
101102
$<$<BOOL:${SLANG_ENABLE_XLIB}>:X11::X11>
102103
"$<$<PLATFORM_ID:Darwin>:-framework Cocoa>"
103104
"$<$<PLATFORM_ID:Darwin>:-framework QuartzCore>"
@@ -106,7 +107,7 @@ if(SLANG_ENABLE_GFX)
106107
EXTRA_COMPILE_DEFINITIONS_PRIVATE
107108
$<$<BOOL:${SLANG_ENABLE_XLIB}>:SLANG_ENABLE_XLIB=1>
108109
INCLUDE_FROM_PRIVATE gfx
109-
INCLUDE_DIRECTORIES_PUBLIC platform
110+
INCLUDE_DIRECTORIES_PUBLIC . platform
110111
EXPORT_MACRO_PREFIX SLANG_PLATFORM
111112
)
112113

@@ -122,6 +123,7 @@ if(SLANG_ENABLE_GFX)
122123
slang
123124
Vulkan-Headers
124125
metal-cpp
126+
stb
125127
$<$<BOOL:${SLANG_ENABLE_XLIB}>:X11::X11>
126128
$<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver>
127129
LINK_WITH_FRAMEWORK Foundation Cocoa QuartzCore Metal
@@ -182,6 +184,7 @@ if(SLANG_ENABLE_TESTS)
182184
EXECUTABLE
183185
EXCLUDE_FROM_ALL
184186
LINK_WITH_PRIVATE core compiler-core slang
187+
INCLUDE_FROM_PRIVATE unit-test
185188
FOLDER test
186189
)
187190
slang_add_target(
@@ -196,10 +199,12 @@ if(SLANG_ENABLE_TESTS)
196199
slang-test
197200
EXECUTABLE
198201
USE_FEWER_WARNINGS
202+
INCLUDE_DIRECTORIES_PUBLIC .
199203
LINK_WITH_PRIVATE
200204
core
201205
compiler-core
202206
slang
207+
stb
203208
${CMAKE_DL_LIBS}
204209
Threads::Threads
205210
REQUIRES
@@ -241,6 +246,7 @@ if(SLANG_ENABLE_TESTS)
241246
unit-test
242247
OBJECT
243248
EXCLUDE_FROM_ALL
249+
INCLUDE_DIRECTORIES_PUBLIC .
244250
INCLUDE_FROM_PRIVATE slang core
245251
INCLUDE_DIRECTORIES_PRIVATE ${slang_SOURCE_DIR}/include
246252
FOLDER test
@@ -254,7 +260,7 @@ if(SLANG_ENABLE_TESTS)
254260
EXCLUDE_FROM_ALL
255261
EXTRA_COMPILE_DEFINITIONS_PRIVATE SLANG_SHARED_LIBRARY_TOOL
256262
USE_FEWER_WARNINGS
257-
LINK_WITH_PRIVATE core slang unit-test gfx gfx-util platform
263+
LINK_WITH_PRIVATE core slang unit-test gfx gfx-util platform stb
258264
OUTPUT_NAME gfx-unit-test-tool
259265
REQUIRED_BY slang-test
260266
FOLDER test/tools
@@ -272,6 +278,7 @@ if(SLANG_ENABLE_TESTS)
272278
slang
273279
slang-rhi
274280
platform
281+
stb
275282
$<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver>
276283
EXTRA_COMPILE_DEFINITIONS_PRIVATE
277284
$<$<BOOL:${SLANG_ENABLE_CUDA}>:RENDER_TEST_CUDA>

‎tools/gfx-unit-test/buffer-barrier-test.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
#include "core/slang-basic.h"
12
#include "gfx-test-util.h"
3+
#include "gfx-util/shader-cursor.h"
24
#include "slang-gfx.h"
3-
#include "source/core/slang-basic.h"
4-
#include "tools/gfx-util/shader-cursor.h"
5-
#include "tools/unit-test/slang-unit-test.h"
5+
#include "unit-test/slang-unit-test.h"
66

77
using namespace gfx;
88

‎tools/gfx-unit-test/clear-texture-test.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
#include "core/slang-basic.h"
12
#include "gfx-test-util.h"
3+
#include "gfx-util/shader-cursor.h"
24
#include "slang-gfx.h"
3-
#include "source/core/slang-basic.h"
4-
#include "tools/gfx-util/shader-cursor.h"
5-
#include "tools/unit-test/slang-unit-test.h"
5+
#include "unit-test/slang-unit-test.h"
66

77
using namespace Slang;
88
using namespace gfx;

‎tools/gfx-unit-test/compute-smoke.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
#include "core/slang-basic.h"
12
#include "gfx-test-util.h"
3+
#include "gfx-util/shader-cursor.h"
24
#include "slang-gfx.h"
3-
#include "source/core/slang-basic.h"
4-
#include "tools/gfx-util/shader-cursor.h"
5-
#include "tools/unit-test/slang-unit-test.h"
5+
#include "unit-test/slang-unit-test.h"
66

77
using namespace gfx;
88

‎tools/gfx-unit-test/compute-trivial.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
#include "core/slang-basic.h"
12
#include "gfx-test-util.h"
3+
#include "gfx-util/shader-cursor.h"
24
#include "slang-gfx.h"
3-
#include "source/core/slang-basic.h"
4-
#include "tools/gfx-util/shader-cursor.h"
5-
#include "tools/unit-test/slang-unit-test.h"
5+
#include "unit-test/slang-unit-test.h"
66

77
using namespace gfx;
88

‎tools/gfx-unit-test/copy-texture-tests.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
#include "core/slang-basic.h"
12
#include "gfx-test-texture-util.h"
23
#include "gfx-test-util.h"
4+
#include "gfx-util/shader-cursor.h"
35
#include "slang-gfx.h"
4-
#include "source/core/slang-basic.h"
5-
#include "tools/gfx-util/shader-cursor.h"
6-
#include "tools/unit-test/slang-unit-test.h"
6+
#include "unit-test/slang-unit-test.h"
77

88
#if SLANG_WINDOWS_FAMILY
99
#include <d3d12.h>

‎tools/gfx-unit-test/create-buffer-from-handle.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
#include "core/slang-basic.h"
12
#include "gfx-test-util.h"
3+
#include "gfx-util/shader-cursor.h"
24
#include "slang-gfx.h"
3-
#include "source/core/slang-basic.h"
4-
#include "tools/gfx-util/shader-cursor.h"
5-
#include "tools/unit-test/slang-unit-test.h"
5+
#include "unit-test/slang-unit-test.h"
66

77
using namespace gfx;
88

0 commit comments

Comments
 (0)