Fix Vulkan build

Author: thatcosmonaut

src/FNA3D_Driver_Vulkan.c

@@ -45,6 +45,18 @@
 #include <SDL_vulkan.h>
 #define SDL_AtomicInt SDL_atomic_t
 #define SDL_Mutex SDL_mutex
+#define SDL_IOStream SDL_RWops
+#define SDL_IOFromFile SDL_RWFromFile
+#define SDL_WriteIO(file, data, size) \
+	file->write( \
+		file, \
+		data, \
+		sizeof(uint8_t), \
+		size \
+	)
+#define SDL_CloseIO(file) file->close(file)
+#define SDL_CreateWindow(title, w, h, flags) SDL_CreateWindow(title, 0, 0, w, h, flags)
+#define SDL_Vulkan_CreateSurface(windowHandle, instance, callbacks, surface) SDL_Vulkan_CreateSurface(windowHandle, instance, surface)
 #endif
 
 #define VULKAN_INTERNAL_clamp(val, min, max) SDL_max(min, SDL_min(val, max))
@@ -2283,7 +2295,9 @@ static uint8_t VULKAN_INTERNAL_CreateInstance(
 ) {
 	VkResult vulkanResult;
 	VkApplicationInfo appInfo;
+#ifdef USE_SDL3
 	char const* const* inferredExtensionNames;
+#endif
 	const char **instanceExtensionNames;
 	uint32_t instanceExtensionCount;
 	VkInstanceCreateInfo createInfo;
@@ -2298,6 +2312,7 @@ static uint8_t VULKAN_INTERNAL_CreateInstance(
 	appInfo.engineVersion = FNA3D_COMPILED_VERSION;
 	appInfo.apiVersion = VK_MAKE_VERSION(1, 0, 0);
 
+#ifdef USE_SDL3
 	inferredExtensionNames = SDL_Vulkan_GetInstanceExtensions(&instanceExtensionCount);
 
 	if (inferredExtensionNames == NULL)
@@ -2322,6 +2337,41 @@ static uint8_t VULKAN_INTERNAL_CreateInstance(
 	{
 		instanceExtensionNames[i] = inferredExtensionNames[i];
 	}
+#else
+	if (!SDL_Vulkan_GetInstanceExtensions(
+		(SDL_Window*) presentationParameters->deviceWindowHandle,
+		&instanceExtensionCount,
+		NULL
+	)) {
+		FNA3D_LogWarn(
+			"SDL_Vulkan_GetInstanceExtensions(): getExtensionCount: %s",
+			SDL_GetError()
+		);
+
+		return 0;
+	}
+
+	/* Extra space for the following extensions:
+	 * VK_KHR_get_physical_device_properties2
+	 * VK_EXT_debug_utils
+	 */
+	instanceExtensionNames = SDL_stack_alloc(
+		const char*,
+		instanceExtensionCount + 2
+	);
+
+	if (!SDL_Vulkan_GetInstanceExtensions(
+		(SDL_Window*) presentationParameters->deviceWindowHandle,
+		&instanceExtensionCount,
+		instanceExtensionNames
+	)) {
+		FNA3D_LogWarn(
+			"SDL_Vulkan_GetInstanceExtensions(): %s",
+			SDL_GetError()
+		);
+		goto create_instance_fail;
+	}
+#endif
 
 	if (!VULKAN_INTERNAL_CheckInstanceExtensions(
 		renderer->debugMode,
@@ -4282,8 +4332,14 @@ static void VULKAN_INTERNAL_SubmitCommands(
 	VulkanSwapchainData *swapchainData = NULL;
 	uint32_t swapchainImageIndex;
 	VulkanCommandBuffer *commandBufferToSubmit;
+	int32_t refreshRate;
 
+#ifdef USE_SDL3
 	const SDL_DisplayMode *mode;
+#else
+	SDL_DisplayMode mode;
+#endif
+
 	VkPipelineStageFlags waitStages = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
 	VkPresentInfoKHR presentInfo;
 	struct
@@ -4298,13 +4354,31 @@ static void VULKAN_INTERNAL_SubmitCommands(
 
 	if (present)
 	{
+#ifdef USE_SDL3
 		mode = SDL_GetCurrentDisplayMode(
 			SDL_GetDisplayForWindow(
 				(SDL_Window*) windowHandle
 			)
 		);
+		refreshRate = mode->refresh_rate;
 
-		swapchainData = (VulkanSwapchainData *)SDL_GetProperty(SDL_GetWindowProperties(windowHandle), WINDOW_SWAPCHAIN_DATA, NULL);
+		swapchainData = (VulkanSwapchainData*) SDL_GetProperty(SDL_GetWindowProperties(windowHandle), WINDOW_SWAPCHAIN_DATA, NULL);
+#else
+		SDL_GetCurrentDisplayMode(
+			SDL_GetWindowDisplayIndex(
+				(SDL_Window*) windowHandle
+			),
+			&mode
+		);
+		refreshRate = mode.refresh_rate;
+		if (refreshRate == 0)
+		{
+			/* Needs to be _something_ */
+			refreshRate = 60;
+		}
+
+		swapchainData = (VulkanSwapchainData*) SDL_GetWindowData(windowHandle, WINDOW_SWAPCHAIN_DATA);
+#endif
 
 		if (swapchainData == NULL)
 		{
@@ -4320,7 +4394,11 @@ static void VULKAN_INTERNAL_SubmitCommands(
 			}
 			else
 			{
+#ifdef USE_SDL3
 				swapchainData = (VulkanSwapchainData *)SDL_GetProperty(SDL_GetWindowProperties(windowHandle), WINDOW_SWAPCHAIN_DATA, NULL);
+#else
+				swapchainData = (VulkanSwapchainData*) SDL_GetWindowData(windowHandle, WINDOW_SWAPCHAIN_DATA);
+#endif
 				validSwapchainExists = 1;
 			}
 		}
@@ -4335,7 +4413,7 @@ static void VULKAN_INTERNAL_SubmitCommands(
 			acquireResult = renderer->vkAcquireNextImageKHR(
 				renderer->logicalDevice,
 				swapchainData->swapchain,
-				10000000000 / mode->refresh_rate, /* ~10 frames, so we'll progress even if throttled to zero. */
+				10000000000 / refreshRate, /* ~10 frames, so we'll progress even if throttled to zero. */
 				swapchainData->imageAvailableSemaphore,
 				VK_NULL_HANDLE,
 				&swapchainImageIndex
@@ -4491,7 +4569,11 @@ static void VULKAN_INTERNAL_SubmitCommands(
 	{
 		if (renderer->supports.GGP_frame_token)
 		{
+#ifdef USE_SDL3
 			const void *token = SDL_GetProperty(SDL_GetWindowProperties(windowHandle), "GgpFrameToken", NULL);
+#else
+			const void *token = SDL_GetWindowData((SDL_Window*) windowHandle, "GgpFrameToken");
+#endif
 			presentInfoGGP.sType = VK_STRUCTURE_TYPE_PRESENT_FRAME_TOKEN_GGP;
 			presentInfoGGP.pNext = NULL;
 			presentInfoGGP.frameToken = (uint64_t) (size_t) token;
@@ -5011,7 +5093,11 @@ static CreateSwapchainResult VULKAN_INTERNAL_CreateSwapchain(
 
 	swapchainData->fence = VK_NULL_HANDLE;
 
+#ifdef USE_SDL3
 	SDL_SetProperty(SDL_GetWindowProperties(windowHandle), WINDOW_SWAPCHAIN_DATA, swapchainData);
+#else
+	SDL_SetWindowData(windowHandle, WINDOW_SWAPCHAIN_DATA, swapchainData);
+#endif
 
 	if (renderer->swapchainDataCount >= renderer->swapchainDataCapacity)
 	{
@@ -5043,7 +5129,11 @@ static void VULKAN_INTERNAL_DestroySwapchain(
 	uint32_t i;
 	VulkanSwapchainData *swapchainData;
 
+#ifdef USE_SDL3
 	swapchainData = (VulkanSwapchainData*) SDL_GetProperty(SDL_GetWindowProperties(windowHandle), WINDOW_SWAPCHAIN_DATA, NULL);
+#else
+	swapchainData = (VulkanSwapchainData*) SDL_GetWindowData(windowHandle, WINDOW_SWAPCHAIN_DATA);
+#endif
 
 	if (swapchainData == NULL)
 	{
@@ -5110,7 +5200,12 @@ static void VULKAN_INTERNAL_DestroySwapchain(
 		}
 	}
 
+#ifdef USE_SDL3
 	SDL_ClearProperty(SDL_GetWindowProperties(windowHandle), WINDOW_SWAPCHAIN_DATA);
+#else
+	SDL_SetWindowData(windowHandle, WINDOW_SWAPCHAIN_DATA, NULL);
+#endif
+
 	SDL_free(swapchainData);
 }