diff --git a/.gitmodules b/.gitmodules index 9f7e75a..5ac8d86 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,11 @@ [submodule "khronos/vulkan"] - path = khronos/vulkan + path = source_third_party/khronos/vulkan url = https://github.com/KhronosGroup/Vulkan-Headers [submodule "khronos/opengles"] - path = khronos/opengles + path = source_third_party/khronos/opengles url = https://github.com/KhronosGroup/OpenGL-Registry [submodule "khronos/egl"] - path = khronos/egl + path = source_third_party/khronos/egl url = https://github.com/KhronosGroup/EGL-Registry [submodule "source_third_party/gtest"] path = source_third_party/gtest diff --git a/generator/generate_vulkan_common.py b/generator/generate_vulkan_common.py index 9bf554e..0aa1960 100755 --- a/generator/generate_vulkan_common.py +++ b/generator/generate_vulkan_common.py @@ -828,7 +828,7 @@ def main() -> int: outdir = os.path.join(base_dir, '..', 'source_common', 'framework') # Parse the XML headers - tree = ET.parse('./khronos/vulkan/registry/vk.xml') + tree = ET.parse('./source_third_party/khronos/vulkan/registry/vk.xml') root = tree.getroot() # Parse function to API version or extension mapping diff --git a/generator/vk_codegen/source_CMakeLists.txt b/generator/vk_codegen/source_CMakeLists.txt index 01b9e65..dcb3f42 100644 --- a/generator/vk_codegen/source_CMakeLists.txt +++ b/generator/vk_codegen/source_CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # ----------------------------------------------------------------------------- -# Copyright (c) 2024 Arm Limited +# Copyright (c) 2024-2025 Arm Limited # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to @@ -41,19 +41,19 @@ configure_file( add_library( ${VK_LAYER} SHARED - ${PROJECT_SOURCE_DIR}/../source_common/framework/entry.cpp + ../../source_common/framework/entry.cpp device.cpp instance.cpp) target_include_directories( ${VK_LAYER} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_common - ${CMAKE_CURRENT_BINARY_DIR} - .) + ./ + ../../source_common/ + ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories( ${VK_LAYER} SYSTEM PRIVATE - ../../khronos/vulkan/include) + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${VK_LAYER}) diff --git a/layer_example/source/CMakeLists.txt b/layer_example/source/CMakeLists.txt index 33dbe6e..8456f98 100644 --- a/layer_example/source/CMakeLists.txt +++ b/layer_example/source/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # ----------------------------------------------------------------------------- -# Copyright (c) 2024 Arm Limited +# Copyright (c) 2024-2025 Arm Limited # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to @@ -41,20 +41,20 @@ configure_file( add_library( ${VK_LAYER} SHARED - ${PROJECT_SOURCE_DIR}/../source_common/framework/entry.cpp + ../../source_common/framework/entry.cpp device.cpp instance.cpp layer_device_functions.cpp) target_include_directories( ${VK_LAYER} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_common - ${CMAKE_CURRENT_BINARY_DIR} - .) + ./ + ../../source_common/ + ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories( ${VK_LAYER} SYSTEM PRIVATE - ../../khronos/vulkan/include) + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${VK_LAYER}) diff --git a/layer_gpu_support/source/CMakeLists.txt b/layer_gpu_support/source/CMakeLists.txt index e24896d..72f6662 100644 --- a/layer_gpu_support/source/CMakeLists.txt +++ b/layer_gpu_support/source/CMakeLists.txt @@ -41,7 +41,7 @@ configure_file( add_library( ${VK_LAYER} SHARED - ${PROJECT_SOURCE_DIR}/../source_common/framework/entry.cpp + ../../source_common/framework/entry.cpp device.cpp instance.cpp layer_config.cpp @@ -53,14 +53,14 @@ add_library( target_include_directories( ${VK_LAYER} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_common - ${CMAKE_CURRENT_BINARY_DIR} - .) + ./ + ../../source_common/ + ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories( ${VK_LAYER} SYSTEM PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party - ${PROJECT_SOURCE_DIR}/../khronos/vulkan/include) + ../../source_third_party/ + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${VK_LAYER}) diff --git a/layer_gpu_timeline/source/CMakeLists.txt b/layer_gpu_timeline/source/CMakeLists.txt index 6dbdc51..2b52fe8 100644 --- a/layer_gpu_timeline/source/CMakeLists.txt +++ b/layer_gpu_timeline/source/CMakeLists.txt @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # ----------------------------------------------------------------------------- -# Copyright (c) 2024 Arm Limited +# Copyright (c) 2024-2025 Arm Limited # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to @@ -41,7 +41,7 @@ configure_file( add_library( ${VK_LAYER} SHARED - ${PROJECT_SOURCE_DIR}/../source_common/framework/entry.cpp + ../../source_common/framework/entry.cpp device.cpp instance.cpp layer_device_functions_command_buffer.cpp @@ -57,14 +57,14 @@ add_library( target_include_directories( ${VK_LAYER} PRIVATE - ${PROJECT_SOURCE_DIR}/../source_common - ${CMAKE_CURRENT_BINARY_DIR} - .) + ./ + ../../source_common/ + ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories( ${VK_LAYER} SYSTEM PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party - ${PROJECT_SOURCE_DIR}/../khronos/vulkan/include) + ../../source_third_party/ + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${VK_LAYER}) diff --git a/source_common/comms/test/CMakeLists.txt b/source_common/comms/test/CMakeLists.txt index 8970930..d15218c 100644 --- a/source_common/comms/test/CMakeLists.txt +++ b/source_common/comms/test/CMakeLists.txt @@ -32,6 +32,8 @@ add_executable( target_include_directories( ${TEST_BINARY} PRIVATE ../../ + ../../../source_third_party/ + ../../../source_third_party/khronos/vulkan/include ${gtest_SOURCE_DIR}/include) target_link_libraries( @@ -66,9 +68,9 @@ target_link_libraries( # Exclude from ctest for now because it needs user to manually run the # external server program before the test can pass -#add_test( -# NAME ${TEST_BINARY} -# COMMAND ${TEST_BINARY}) +# add_test( +# NAME ${TEST_BINARY} +# COMMAND ${TEST_BINARY}) install( TARGETS ${TEST_BINARY} diff --git a/source_common/framework/CMakeLists.txt b/source_common/framework/CMakeLists.txt index 272b769..0ca2f06 100644 --- a/source_common/framework/CMakeLists.txt +++ b/source_common/framework/CMakeLists.txt @@ -31,16 +31,15 @@ add_library( target_include_directories( ${LIB_BINARY} PRIVATE - # Include from the layer-specific tree + ../ + # Include from the layer-specific trees ${PROJECT_SOURCE_DIR}/source - # Needed for CMake generated version.hpp - ${PROJECT_BINARY_DIR}/source - ../) + ${PROJECT_BINARY_DIR}/source) target_include_directories( ${LIB_BINARY} SYSTEM PRIVATE - ${PROJECT_SOURCE_DIR}/../source_third_party - ${PROJECT_SOURCE_DIR}/../khronos/vulkan/include - ../) + ../ + ../../source_third_party/ + ../../source_third_party/khronos/vulkan/include/) lgl_set_build_options(${LIB_BINARY}) diff --git a/source_common/trackers/CMakeLists.txt b/source_common/trackers/CMakeLists.txt index 8318d8c..9d1259d 100644 --- a/source_common/trackers/CMakeLists.txt +++ b/source_common/trackers/CMakeLists.txt @@ -33,9 +33,9 @@ add_library( target_include_directories( ${LIB_BINARY} PRIVATE - ../../khronos/vulkan/include - ../../source_third_party - ../) + ../ + ../../source_third_party/ + ../../source_third_party/khronos/vulkan/include) lgl_set_build_options(${LIB_BINARY}) diff --git a/khronos/egl b/source_third_party/khronos/egl similarity index 100% rename from khronos/egl rename to source_third_party/khronos/egl diff --git a/khronos/opengles b/source_third_party/khronos/opengles similarity index 100% rename from khronos/opengles rename to source_third_party/khronos/opengles diff --git a/khronos/vulkan b/source_third_party/khronos/vulkan similarity index 100% rename from khronos/vulkan rename to source_third_party/khronos/vulkan