fix: 重复定义了Vulkan函数指针

MovTery · MovTery · commit e737be8070fb · 2026-05-13T21:10:39.000+08:00
diff --git a/ZalithLauncher/src/main/jni/vulkan_checker.c b/ZalithLauncher/src/main/jni/vulkan_checker.c
@@ -58,15 +58,6 @@ Java_com_movtery_zalithlauncher_utils_device_VulkanChecker_nativeSetLogCallback(
     }
 }
 
-/* ---------- Vulkan 函数指针类型 ---------- */
-typedef VkResult (*PFN_vkEnumerateInstanceVersion)(uint32_t* pApiVersion);
-typedef VkResult (*PFN_vkCreateInstance)(const VkInstanceCreateInfo*, const VkAllocationCallbacks*, VkInstance*);
-typedef void     (*PFN_vkDestroyInstance)(VkInstance, const VkAllocationCallbacks*);
-typedef VkResult (*PFN_vkEnumeratePhysicalDevices)(VkInstance, uint32_t*, VkPhysicalDevice*);
-typedef void     (*PFN_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice, VkPhysicalDeviceFeatures*);
-typedef VkResult (*PFN_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice, const char*, uint32_t*, VkExtensionProperties*);
-typedef void     (*PFN_vkGetPhysicalDeviceFeatures2)(VkPhysicalDevice, VkPhysicalDeviceFeatures2*);
-
 #define LOAD_VK_FUNC(name) PFN_##name p##name = (PFN_##name)dlsym(vulkan_handle, #name)
 
 JNIEXPORT jobject JNICALL

Original file line number	Diff line number	Diff line change
`@@ -58,15 +58,6 @@ Java_com_movtery_zalithlauncher_utils_device_VulkanChecker_nativeSetLogCallback(`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`-/* ---------- Vulkan 函数指针类型 ---------- */`
`62`		`-typedef VkResult (PFN_vkEnumerateInstanceVersion)(uint32_t pApiVersion);`
`63`		`-typedef VkResult (PFN_vkCreateInstance)(const VkInstanceCreateInfo, const VkAllocationCallbacks, VkInstance);`
`64`		`-typedef void (PFN_vkDestroyInstance)(VkInstance, const VkAllocationCallbacks);`
`65`		`-typedef VkResult (PFN_vkEnumeratePhysicalDevices)(VkInstance, uint32_t, VkPhysicalDevice*);`
`66`		`-typedef void (PFN_vkGetPhysicalDeviceFeatures)(VkPhysicalDevice, VkPhysicalDeviceFeatures);`
`67`		`-typedef VkResult (PFN_vkEnumerateDeviceExtensionProperties)(VkPhysicalDevice, const char, uint32_t, VkExtensionProperties);`
`68`		`-typedef void (PFN_vkGetPhysicalDeviceFeatures2)(VkPhysicalDevice, VkPhysicalDeviceFeatures2);`
`69`		`-`
`70`	`61`	`#define LOAD_VK_FUNC(name) PFN_##name p##name = (PFN_##name)dlsym(vulkan_handle, #name)`
`71`	`62`
`72`	`63`	`JNIEXPORT jobject JNICALL`