Skip to content

NBL_CREATE_NSC_COMPILE_RULES and example updates #907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

NBL_CREATE_NSC_COMPILE_RULES and example updates #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c120e16
save work
AnastaZIuk Jul 17, 2025
0a33016
add optional DEPENDS and LINK_TO args to NBL_CREATE_NSC_COMPILE_RULES…
AnastaZIuk Jul 21, 2025
70736f0
pull master resolve conflicts
AnastaZIuk Jul 22, 2025
9894b1e
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla …
AnastaZIuk Jul 22, 2025
6e66d83
Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla …
AnastaZIuk Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions cmake/common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,13 +1325,17 @@ struct DeviceConfigCaps
endif()

set(REQUIRED_SINGLE_ARGS TARGET BINARY_DIR OUTPUT_VAR INPUTS INCLUDE NAMESPACE MOUNT_POINT_DEFINE)
cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "COMMON_OPTIONS" ${ARGV})
cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS};LINK_TO" "COMMON_OPTIONS;DEPENDS" ${ARGV})
NBL_PARSE_REQUIRED(IMPL ${REQUIRED_SINGLE_ARGS})

if(NOT TARGET ${IMPL_TARGET})
add_library(${IMPL_TARGET} INTERFACE)
endif()

if(IMPL_LINK_TO)
target_link_libraries(${IMPL_LINK_TO} PUBLIC ${IMPL_TARGET})
endif()

if(IS_ABSOLUTE "${IMPL_INCLUDE}")
message(FATAL_ERROR "INCLUDE argument must be relative path")
endif()
Expand Down Expand Up @@ -1429,6 +1433,10 @@ namespace @IMPL_NAMESPACE@ {
endif()
endif()

if(IMPL_DEPENDS)
list(APPEND DEPENDS_ON ${IMPL_DEPENDS})
endif()

set(HAS_CAPS FALSE)
set(CAPS_LENGTH 0)
string(JSON CAPS_TYPE TYPE "${IMPL_INPUTS}" ${INDEX} CAPS)
Expand Down Expand Up @@ -1625,9 +1633,14 @@ endfunction()

function(NBL_CREATE_RESOURCE_ARCHIVE)
set(REQUIRED_SINGLE_ARGS TARGET BIND NAMESPACE)
cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "BUILTINS" ${ARGV})
cmake_parse_arguments(IMPL "" "${REQUIRED_SINGLE_ARGS}" "BUILTINS;LINK_TO" ${ARGV})
NBL_PARSE_REQUIRED(IMPL ${REQUIRED_SINGLE_ARGS})

if(NOT NBL_EMBED_BUILTIN_RESOURCES)
add_library(${IMPL_TARGET} INTERFACE) # dummy, could use LINK_TO but makes no difference in this case
return()
endif()

set(IMPL_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${IMPL_TARGET}")

set(_BUNDLE_ARCHIVE_ABSOLUTE_PATH_ "")
Expand All @@ -1641,17 +1654,18 @@ function(NBL_CREATE_RESOURCE_ARCHIVE)
get_filename_component(BUILTIN_ARCHIVE_INPUT_ABS_ENTRY "${IMPL_INPUT_DIRECTORY}" ABSOLUTE)
set(BUILTIN_KEY_ENTRY_ABS "${BUILTIN_ARCHIVE_INPUT_ABS_ENTRY}/${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}")

if(NBL_EMBED_BUILTIN_RESOURCES)
foreach(IT ${IMPL_BUILTINS})
if(NBL_LOG_VERBOSE)
message(STATUS "[${IMPL_TARGET}'s Builtins]: Registered \"${IT}\" key")
endif()
unset(NBL_RESOURCES_TO_EMBED)
foreach(IT ${IMPL_BUILTINS})
if(NBL_LOG_VERBOSE)
message(STATUS "[${IMPL_TARGET}'s Builtins]: Registered \"${IT}\" key")
endif()

LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED ${IT})
endforeach()
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED ${IT})
endforeach()

ADD_CUSTOM_BUILTIN_RESOURCES(${IMPL_TARGET} NBL_RESOURCES_TO_EMBED "${_BUNDLE_SEARCH_DIRECTORY_}" "${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" "${_BUILTIN_RESOURCES_NAMESPACE_}" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}" "${_LINK_MODE_}")
else()
add_library(${IMPL_TARGET} INTERFACE) # dummy
ADD_CUSTOM_BUILTIN_RESOURCES(${IMPL_TARGET} NBL_RESOURCES_TO_EMBED "${_BUNDLE_SEARCH_DIRECTORY_}" "${_BUNDLE_ARCHIVE_ABSOLUTE_PATH_}" "${_BUILTIN_RESOURCES_NAMESPACE_}" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}" "${_LINK_MODE_}")

if(IMPL_LINK_TO)
LINK_BUILTIN_RESOURCES_TO_TARGET(${IMPL_LINK_TO} ${IMPL_TARGET})
endif()
endfunction()
2 changes: 1 addition & 1 deletion examples_tests
Open in desktop
Submodule examples_tests updated 15 files
+12 −22 23_Arithmetic2UnitTest/CMakeLists.txt
+1 −1 23_Arithmetic2UnitTest/app_resources/shaderCommon.hlsl
+1 −1 23_Arithmetic2UnitTest/app_resources/testSubgroup.comp.hlsl
+1 −1 23_Arithmetic2UnitTest/app_resources/testWorkgroup.comp.hlsl
+35 −19 27_MPMCScheduler/CMakeLists.txt
+2 −2 27_MPMCScheduler/app_resources/schedulers/mpmc.hlsl
+2 −2 27_MPMCScheduler/app_resources/shader.comp.hlsl
+1 −1 27_MPMCScheduler/app_resources/workgroup/pool_allocator.hlsl
+24 −16 27_MPMCScheduler/main.cpp
+12 −22 29_Arithmetic2Bench/CMakeLists.txt
+1 −1 29_Arithmetic2Bench/app_resources/benchmarkSubgroup.comp.hlsl
+1 −1 29_Arithmetic2Bench/app_resources/benchmarkWorkgroup.comp.hlsl
+1 −1 29_Arithmetic2Bench/app_resources/shaderCommon.hlsl
+12 −8 CMakeLists.txt
+18 −14 common/include/nbl/examples/common/BuiltinResourcesApplication.hpp
Loading