Skip to content

Commit 2f12cdb

Browse files
solidpixelsolidpixel
committed
Add safe_struct to common code
1 parent 4aef590 commit 2f12cdb

File tree

8 files changed

+28
-19
lines changed

8 files changed

+28
-19
lines changed

‎generator/vk_codegen/source_CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ target_include_directories(
5353

5454
target_include_directories(
5555
${VK_LAYER} SYSTEM PRIVATE
56-
../../source_third_party/khronos/vulkan/include/)
56+
../../source_third_party/khronos/vulkan/include/
57+
../../source_third_party/khronos/vulkan-utilities/include/)
5758

5859
lgl_set_build_options(${VK_LAYER})
5960

‎layer_example/source/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ target_include_directories(
5454

5555
target_include_directories(
5656
${VK_LAYER} SYSTEM PRIVATE
57-
../../source_third_party/khronos/vulkan/include/)
57+
../../source_third_party/khronos/vulkan/include/
58+
../../source_third_party/khronos/vulkan-utilities/include/)
5859

5960
lgl_set_build_options(${VK_LAYER})
6061

‎layer_gpu_support/source/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ target_include_directories(
6262
target_include_directories(
6363
${VK_LAYER} SYSTEM PRIVATE
6464
../../source_third_party/
65-
../../source_third_party/khronos/vulkan/include/)
65+
../../source_third_party/khronos/vulkan/include/
66+
../../source_third_party/khronos/vulkan-utilities/include/)
6667

6768
lgl_set_build_options(${VK_LAYER})
6869

‎layer_gpu_timeline/source/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ target_include_directories(
6666
${VK_LAYER} SYSTEM PRIVATE
6767
../../source_third_party/
6868
../../source_third_party/khronos/vulkan/include/
69+
../../source_third_party/khronos/vulkan-utilities/include/
6970
../../source_third_party/protopuf/include/)
7071

7172
lgl_set_build_options(${VK_LAYER})

‎source_common/comms/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22
# -----------------------------------------------------------------------------
3-
# Copyright (c) 2024 Arm Limited
3+
# Copyright (c) 2024-2025 Arm Limited
44
#
55
# Permission is hereby granted, free of charge, to any person obtaining a copy
66
# of this software and associated documentation files (the "Software"), to
@@ -33,12 +33,13 @@ add_library(
3333
target_include_directories(
3434
${LIB_BINARY} PRIVATE
3535
../
36-
../../source_third_party/khronos/vulkan/include/)
36+
../../source_third_party/khronos/vulkan/include/
37+
../../source_third_party/khronos/vulkan-utilities/include/)
3738

3839
lgl_set_build_options(${LIB_BINARY})
3940

4041
if(${LGL_UNITTEST})
4142
add_subdirectory(test)
4243
endif()
4344

44-
add_clang_tools()
45+
add_clang_tools()

‎source_common/comms/test/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22
# -----------------------------------------------------------------------------
3-
# Copyright (c) 2024 Arm Limited
3+
# Copyright (c) 2024-2025 Arm Limited
44
#
55
# Permission is hereby granted, free of charge, to any person obtaining a copy
66
# of this software and associated documentation files (the "Software"), to
@@ -34,6 +34,7 @@ target_include_directories(
3434
../../
3535
../../../source_third_party/
3636
../../../source_third_party/khronos/vulkan/include
37+
../../source_third_party/khronos/vulkan-utilities/include/
3738
${gtest_SOURCE_DIR}/include)
3839

3940
target_link_libraries(
@@ -76,4 +77,4 @@ install(
7677
TARGETS ${TEST_BINARY}
7778
DESTINATION bin)
7879

79-
add_clang_tools()
80+
add_clang_tools()

‎source_common/framework/CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ add_library(
2828
device_functions.cpp
2929
device_query.cpp
3030
instance_functions.cpp
31-
manual_functions.cpp)
31+
manual_functions.cpp
32+
../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_core.cpp
33+
../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_ext.cpp
34+
../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_khr.cpp
35+
../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_manual.cpp
36+
../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_utils.cpp
37+
../../source_third_party/khronos/vulkan-utilities/src/vulkan/vk_safe_struct_vendor.cpp)
3238

3339
target_include_directories(
3440
${LIB_BINARY} PRIVATE
@@ -41,8 +47,9 @@ target_include_directories(
4147
${LIB_BINARY} SYSTEM PRIVATE
4248
../
4349
../../source_third_party/
44-
../../source_third_party/khronos/vulkan/include/)
50+
../../source_third_party/khronos/vulkan/include/
51+
../../source_third_party/khronos/vulkan-utilities/include/)
4552

4653
lgl_set_build_options(${LIB_BINARY})
4754

48-
add_clang_tools()
55+
add_clang_tools()

‎source_common/trackers/CMakeLists.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: MIT
22
# -----------------------------------------------------------------------------
3-
# Copyright (c) 2024 Arm Limited
3+
# Copyright (c) 2024-2025 Arm Limited
44
#
55
# Permission is hereby granted, free of charge, to any person obtaining a copy
66
# of this software and associated documentation files (the "Software"), to
@@ -35,13 +35,9 @@ target_include_directories(
3535
${LIB_BINARY} PRIVATE
3636
../
3737
../../source_third_party/
38-
../../source_third_party/khronos/vulkan/include)
38+
../../source_third_party/khronos/vulkan/include
39+
../../source_third_party/khronos/vulkan-utilities/include/)
3940

4041
lgl_set_build_options(${LIB_BINARY})
4142

42-
# No unit tests for this module yet
43-
#if(${LGL_UNITTEST})
44-
# add_subdirectory(test)
45-
#endif()
46-
47-
add_clang_tools()
43+
add_clang_tools()

0 commit comments

Comments
 (0)