mirror of
https://github.com/NVIDIA/cuda-samples.git
synced 2025-04-10 18:22:11 +01:00
Merge 9fef149372771988d237225ac5dbec6a03c324f1 into efb46383e0bfd323247691d2fc3382f99271bb6f
This commit is contained in:
commit
37c41a412e
@ -117,9 +117,12 @@ VulkanBaseApp::VulkanBaseApp(const std::string &appName, bool enableValidation)
|
||||
VkExternalSemaphoreHandleTypeFlagBits
|
||||
VulkanBaseApp::getDefaultSemaphoreHandleType() {
|
||||
#ifdef _WIN64
|
||||
return IsWindows8OrGreater()
|
||||
? VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT
|
||||
: VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT;
|
||||
// "IsWindows8<xxx>orGreater" returns false on windows 10!
|
||||
// https://docs.microsoft.com/en-us/windows/win32/sysinfo/version-helper-apis
|
||||
//return IsWindows8OrGreater()
|
||||
// ? VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT
|
||||
// : VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT;
|
||||
return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT;
|
||||
#else
|
||||
return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT;
|
||||
#endif /* _WIN64 */
|
||||
@ -127,9 +130,12 @@ VulkanBaseApp::getDefaultSemaphoreHandleType() {
|
||||
|
||||
VkExternalMemoryHandleTypeFlagBits VulkanBaseApp::getDefaultMemHandleType() {
|
||||
#ifdef _WIN64
|
||||
return IsWindows8Point1OrGreater()
|
||||
? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
|
||||
: VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT;
|
||||
// "IsWindows8<xxx>orGreater" returns false on windows 10!
|
||||
// https://docs.microsoft.com/en-us/windows/win32/sysinfo/version-helper-apis
|
||||
//return IsWindows8Point1OrGreater()
|
||||
// ? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT
|
||||
// : VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT;
|
||||
return VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT;
|
||||
#else
|
||||
return VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
|
||||
#endif /* _WIN64 */
|
||||
|
@ -345,6 +345,9 @@ class VulkanCudaSineWave : public VulkanBaseApp {
|
||||
|
||||
externalMemoryHandleDesc.size = size;
|
||||
|
||||
// https://docs.nvidia.com/cuda/cuda-c-programming-guide/index.html#importing-memory-objects-vul-int
|
||||
externalMemoryHandleDesc.flags |= cudaExternalMemoryDedicated;
|
||||
|
||||
#ifdef _WIN64
|
||||
externalMemoryHandleDesc.handle.win32.handle =
|
||||
(HANDLE)getMemHandle(vkMem, handleType);
|
||||
|
Loading…
x
Reference in New Issue
Block a user