NASP/cuda-samples
35
0
Fork 0
mirror of https://github.com/NVIDIA/cuda-samples.git synced 2024-11-24 18:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: simpleVulkan now works on windows 10

Browse Source 
Bugfix #1:  added missing cudaExternalMemoryDedicated flag on cudaExternalMemoryHandleDesc
Bugfix #2:  IsWindows8<xxx>OrGreater queries return false on Windows 10. Always returning Windows 10 values now (might break on older Windows versions)
This commit is contained in:
Schabrackentapir 2022-02-13 00:11:21 +01:00
parent b312abaa07
commit 9fef149372
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Samples/5_Domain_Specific/simpleVulkan/VulkanBaseApp.cpp
View File

@ -115,9 +115,12 @@ VulkanBaseApp::VulkanBaseApp(const std::string &appName, bool enableValidation)
VkExternalSemaphoreHandleTypeFlagBits VkExternalSemaphoreHandleTypeFlagBits
VulkanBaseApp::getDefaultSemaphoreHandleType() { VulkanBaseApp::getDefaultSemaphoreHandleType() {
#ifdef _WIN64 #ifdef _WIN64
return IsWindows8OrGreater() // "IsWindows8<xxx>orGreater" returns false on windows 10!
? VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT // https://docs.microsoft.com/en-us/windows/win32/sysinfo/version-helper-apis
: VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; //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 #else
return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; return VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT;
#endif /* _WIN64 */ #endif /* _WIN64 */
@ -125,9 +128,12 @@ VulkanBaseApp::getDefaultSemaphoreHandleType() {
VkExternalMemoryHandleTypeFlagBits VulkanBaseApp::getDefaultMemHandleType() { VkExternalMemoryHandleTypeFlagBits VulkanBaseApp::getDefaultMemHandleType() {
#ifdef _WIN64 #ifdef _WIN64
return IsWindows8Point1OrGreater() // "IsWindows8<xxx>orGreater" returns false on windows 10!
? VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT // https://docs.microsoft.com/en-us/windows/win32/sysinfo/version-helper-apis
: VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; //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 #else
return VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; return VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT;
#endif /* _WIN64 */ #endif /* _WIN64 */

3
Samples/5_Domain_Specific/simpleVulkan/main.cpp
View File

@ -345,6 +345,9 @@ class VulkanCudaSineWave : public VulkanBaseApp {
externalMemoryHandleDesc.size = size; externalMemoryHandleDesc.size = size;
// https://docs.nvidia.com/cuda/cuda-c-programming-guide/index.html#importing-memory-objects-vul-int
externalMemoryHandleDesc.flags |= cudaExternalMemoryDedicated;
#ifdef _WIN64 #ifdef _WIN64
externalMemoryHandleDesc.handle.win32.handle = externalMemoryHandleDesc.handle.win32.handle =
(HANDLE)getMemHandle(vkMem, handleType); (HANDLE)getMemHandle(vkMem, handleType);