Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename VulkanDriver to avoid conflict with statically linked SDL3 #216

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Rename VulkanDriver to avoid conflict with statically linked SDL3 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/FNA3D.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/FNA3D_Driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/FNA3D_Driver_Vulkan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12101,7 +12101,7 @@ static FNA3D_Device* VULKAN_CreateDevice(
return result;
}

FNA3D_Driver VulkanDriver = {
FNA3D_Driver LegacyVulkanDriver = {
"Vulkan",
VULKAN_PrepareWindowAttributes,
VULKAN_CreateDevice
Expand Down