From 174c9f613873b349cbf69a481cb17f4845c6eaad Mon Sep 17 00:00:00 2001 From: "M. P. Halpin" Date: Thu, 24 Oct 2024 21:13:40 -0400 Subject: [PATCH] Rename VulkanDriver to avoid conflict with statically linked SDL3 --- src/FNA3D.c | 2 +- src/FNA3D_Driver.h | 2 +- src/FNA3D_Driver_Vulkan.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/FNA3D.c b/src/FNA3D.c index 9da0aa32..17e890ac 100644 --- a/src/FNA3D.c +++ b/src/FNA3D.c @@ -50,7 +50,7 @@ static const FNA3D_Driver *drivers[] = { &OpenGLDriver, #endif #if FNA3D_DRIVER_VULKAN /* TODO: Bump this to the top when Vulkan is done! */ - &VulkanDriver, + &LegacyVulkanDriver, #endif #if FNA3D_DRIVER_GNMX &GNMXDriver, diff --git a/src/FNA3D_Driver.h b/src/FNA3D_Driver.h index f2496330..4f07960c 100644 --- a/src/FNA3D_Driver.h +++ b/src/FNA3D_Driver.h @@ -825,7 +825,7 @@ typedef struct FNA3D_Driver ); } FNA3D_Driver; -FNA3D_SHAREDINTERNAL FNA3D_Driver VulkanDriver; +FNA3D_SHAREDINTERNAL FNA3D_Driver LegacyVulkanDriver; FNA3D_SHAREDINTERNAL FNA3D_Driver D3D11Driver; FNA3D_SHAREDINTERNAL FNA3D_Driver OpenGLDriver; FNA3D_SHAREDINTERNAL FNA3D_Driver SDLGPUDriver; diff --git a/src/FNA3D_Driver_Vulkan.c b/src/FNA3D_Driver_Vulkan.c index eec47ca5..7c37a7b6 100644 --- a/src/FNA3D_Driver_Vulkan.c +++ b/src/FNA3D_Driver_Vulkan.c @@ -12101,7 +12101,7 @@ static FNA3D_Device* VULKAN_CreateDevice( return result; } -FNA3D_Driver VulkanDriver = { +FNA3D_Driver LegacyVulkanDriver = { "Vulkan", VULKAN_PrepareWindowAttributes, VULKAN_CreateDevice