Test windows

Beanavil · Dec 14, 2023 · 3016659 · 3016659
1 parent c0ae855
commit 3016659
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 35 deletions.
diff --git a/samples/extensions/khr/externalmemory/main.c b/samples/extensions/khr/externalmemory/main.c
@@ -217,18 +217,6 @@ bool cl_check_external_memory_handle_type(
     exit(EXIT_FAILURE);
 }
 
-// Vulkan function to export a:
-// - POSIX file descriptor or
-// - a Windows handle
-// referencing the payload of a Vulkan device memory object.
-const char* vk_get_memory_function_name =
-#ifdef _WIN32
-    "vkGetMemoryWin32HandleKHR"
-#else
-    "vkGetMemoryFdKHR"
-#endif
-    ;
-
 int main(int argc, char* argv[])
 {
     cl_int error = CL_SUCCESS;
@@ -513,14 +501,27 @@ int main(int argc, char* argv[])
     fd_info_y.handleType = vk_external_memory_handle_type;
     int fd_y;
 
-    // We need to get the pointer to the vkGetMemoryFdKHR function because it's
-    // from extension VK_KHR_external_memory_fd.
-    PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR =
+    // We need to get the pointer to the
+    // vkGetMemoryFdKHR/vkGetMemoryWin32HandleKHR function because it's from
+    // extension VK_KHR_external_memory_fd. This Vulkan function exports a POSIX
+    // file descriptor/Windows handle referencing the payload of a Vulkan device
+    // memory object.
+#ifdef _WIN32
+    PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR;
+    *(PFN_vkGetMemoryWin32HandleKHR*)&vkGetMemoryWin32HandleKHR =
+        (PFN_vkGetMemoryWin32HandleKHR)vkGetDeviceProcAddr(
+            vk_device, "vkGetMemoryWin32HandleKHR");
+    VK_CHECK(vkGetMemoryWin32HandleKHR(vk_device, &fd_info_x, &fd_x));
+    VK_CHECK(vkGetMemoryWin32HandleKHR(vk_device, &fd_info_y, &fd_y));
+#else
+    PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR;
+    *(PFN_vkGetMemoryFdKHR*)&vkGetMemoryFdKHR =
         (PFN_vkGetMemoryFdKHR)vkGetDeviceProcAddr(vk_device,
-                                                  vk_get_memory_function_name);
-
+                                                  "vkGetMemoryFdKHR");
     VK_CHECK(vkGetMemoryFdKHR(vk_device, &fd_info_x, &fd_x));
     VK_CHECK(vkGetMemoryFdKHR(vk_device, &fd_info_y, &fd_y));
+#endif
+
 
     // Create OpenCL buffers from Vulkan external memory file descriptors.
     cl_mem_properties ext_mem_props_x[] = {

diff --git a/samples/extensions/khr/externalmemory/main.cpp b/samples/extensions/khr/externalmemory/main.cpp
@@ -138,18 +138,6 @@ bool cl_check_external_memory_handle_type(
     return it != supported_handle_types.end();
 }
 
-// Vulkan function to export a:
-// - POSIX file descriptor or
-// - a Windows handle
-// referencing the payload of a Vulkan device memory object.
-const std::string vk_get_memory_function_name =
-#ifdef _WIN32
-    std::string{ "vkGetMemoryWin32HandleKHR" }
-#else
-    std::string{ "vkGetMemoryFdKHR" }
-#endif
-;
-
 int main(int argc, char* argv[])
 {
     try
@@ -432,14 +420,26 @@ int main(int argc, char* argv[])
         fd_info_y.handleType = vk_external_memory_handle_type;
         int fd_y;
 
-        // We need to get the pointer to the vkGetMemoryFdKHR function because
-        // it's from extension VK_KHR_external_memory_fd.
-        PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR =
-            (PFN_vkGetMemoryFdKHR)vkGetDeviceProcAddr(
-                vk_device, vk_get_memory_function_name.c_str());
-
+        // We need to get the pointer to the
+        // vkGetMemoryFdKHR/vkGetMemoryWin32HandleKHR function because it's from
+        // extension VK_KHR_external_memory_fd. This Vulkan function exports a
+        // POSIX file descriptor/Windows handle referencing the payload of a
+        // Vulkan device memory object.
+#ifdef _WIN32
+        PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR;
+        *(PFN_vkGetMemoryWin32HandleKHR*)&vkGetMemoryWin32HandleKHR =
+            (PFN_vkGetMemoryWin32HandleKHR)vkGetDeviceProcAddr(
+                vk_device, "vkGetMemoryWin32HandleKHR");
+        VK_CHECK(vkGetMemoryWin32HandleKHR(vk_device, &fd_info_x, &fd_x));
+        VK_CHECK(vkGetMemoryWin32HandleKHR(vk_device, &fd_info_y, &fd_y));
+#else
+        PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR;
+        *(PFN_vkGetMemoryFdKHR*)&vkGetMemoryFdKHR =
+            (PFN_vkGetMemoryFdKHR)vkGetDeviceProcAddr(vk_device,
+                                                      "vkGetMemoryFdKHR");
         VK_CHECK(vkGetMemoryFdKHR(vk_device, &fd_info_x, &fd_x));
         VK_CHECK(vkGetMemoryFdKHR(vk_device, &fd_info_y, &fd_y));
+#endif
 
         // Create OpenCL buffers from Vulkan external memory file descriptors.
         std::vector<cl_mem_properties> ext_mem_props_x = {