Skip to content

Cuda interop vk13 #90

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 21 commits into
base: master
Choose a base branch
from
Open

Cuda interop vk13 #90

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3a02134
working cuda vulkan interop example
atkurtul Jul 9, 2023
c90032d
proper cleanup
atkurtul Jul 9, 2023
6d0a577
add cuda to vulkan example
atkurtul Jul 9, 2023
867b435
refactor
atkurtul Jul 9, 2023
831e61e
semaphore interop
atkurtul Jul 15, 2023
1396829
update
atkurtul Jul 16, 2023
d7fb50e
texture sharing
atkurtul Jul 27, 2023
682a8c1
update to latest changes
atkurtul Aug 6, 2023
faddda4
Merge branch 'cuda-interop' into HEAD
atkurtul Jan 4, 2024
6ce21d5
cuda-interop-vk13
atkurtul Jan 4, 2024
4159025
fix sync
atkurtul Jan 4, 2024
c1b0ddc
Merge remote-tracking branch 'origin/vulkan_1_3' into HEAD
atkurtul Jan 13, 2024
386608b
rename 63 example folder
atkurtul Jan 13, 2024
f9a2d1b
derive from monodevice
atkurtul Jan 14, 2024
138356a
rewrite stuff
atkurtul Jan 14, 2024
e96a4bf
Merge commit '558f9724' into HEAD
atkurtul Jan 14, 2024
db2ac71
reflect nabla changes
atkurtul Jan 18, 2024
744dd44
address pr comments
atkurtul Jan 18, 2024
59ebd29
filter cuda compatible devices
atkurtul Jan 18, 2024
9897e11
Merge branch 'vulkan_1_3' into cuda-interop-vk13
atkurtul Jan 18, 2024
73f1479
fix some comments & add test code
atkurtul Jan 19, 2024
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
2 changes: 1 addition & 1 deletion 03_DeviceSelectionAndSharedSources/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class DeviceSelectionAndSharedSourcesApp final : public examples::MonoDeviceAppl
bool onAppInitialized(smart_refctd_ptr<ISystem>&& system) override
{
// Remember to call the base class initialization!
if (!device_base_t::onAppInitialized(std::move(system)))
if (!device_base_t::onAppInitialized(smart_refctd_ptr(system)))
return false;
if (!asset_base_t::onAppInitialized(std::move(system)))
return false;
Expand Down
264 changes: 0 additions & 264 deletions 22_CppCompat/test.hlsl.orig
View file
Open in desktop

This file was deleted.

29 changes: 18 additions & 11 deletions 63_CUDAInterop/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@

include(common RESULT_VARIABLE RES)
if(NOT RES)
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
endif()

set(CUDA_INTEROP_EXAMPLE_INCLUDE_DIRS
${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
)
nbl_create_executable_project("" "" "" "" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")

if(NBL_EMBED_BUILTIN_RESOURCES)
set(_BR_TARGET_ ${EXECUTABLE_NAME}_builtinResourceData)
set(RESOURCE_DIR "app_resources")

get_filename_component(_SEARCH_DIRECTORIES_ "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)

file(GLOB_RECURSE BUILTIN_RESOURCE_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}/*")
foreach(RES_FILE ${BUILTIN_RESOURCE_FILES})
LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "${RES_FILE}")
endforeach()

ADD_CUSTOM_BUILTIN_RESOURCES(${_BR_TARGET_} RESOURCES_TO_EMBED "${_SEARCH_DIRECTORIES_}" "${RESOURCE_DIR}" "nbl::this_example::builtin" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}")

nbl_create_executable_project(
""
""
"${CUDA_INTEROP_EXAMPLE_INCLUDE_DIRS}"
""
"${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}"
)
LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} ${_BR_TARGET_})
endif()
2 changes: 1 addition & 1 deletion 63_CUDAInterop/vectorAdd_kernel.cu → ...Interop/app_resources/vectorAdd_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ extern "C" __global__ void vectorAdd(const float *A, const float *B, float *C,
if (i < numElements) {
C[i] = A[i] + B[i];
}
}
}
Loading