Skip to content

Fix MoltenVK on Apple Silicon #64

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix MoltenVK on Apple Silicon #64

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
1 change: 1 addition & 0 deletions src/Veldrid/Vk/CommonStrings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ internal static class CommonStrings
public static FixedUtf8String Main { get; } = "main";
public static FixedUtf8String VkKhrGetPhysicalDeviceProperties2 { get; } = "VK_KHR_get_physical_device_properties2";
public static FixedUtf8String VkKhrPortabilitySubset { get; } = "VK_KHR_portability_subset";
public static FixedUtf8String VkKhrPortabilityEnumeration { get; } = "VK_KHR_portability_enumeration";
}
}
12 changes: 12 additions & 0 deletions src/Veldrid/Vk/VkGraphicsDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,13 @@ private void createInstance(bool debug, VulkanDeviceOptions options)

if (availableInstanceExtensions.Contains(CommonStrings.VkKhrPortabilitySubset)) surfaceExtensions.Add(CommonStrings.VkKhrPortabilitySubset);

bool hasPortabilityEnumeration = false;
if (availableInstanceExtensions.Contains(CommonStrings.VkKhrPortabilityEnumeration))
{
hasPortabilityEnumeration = true;
surfaceExtensions.Add(CommonStrings.VkKhrPortabilityEnumeration);
}

if (availableInstanceExtensions.Contains(CommonStrings.VkKhrSurfaceExtensionName)) surfaceExtensions.Add(CommonStrings.VkKhrSurfaceExtensionName);

if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
Expand Down Expand Up @@ -839,6 +846,11 @@ private void createInstance(bool debug, VulkanDeviceOptions options)
instanceCi.enabledExtensionCount = instanceExtensions.Count;
instanceCi.ppEnabledExtensionNames = (byte**)instanceExtensions.Data;

if (hasPortabilityEnumeration && RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) {
// Required for MoltenVK to work on Apple Silicon.
instanceCi.flags |= (uint)VkInstanceCreateFlagBits.PortabilityBitKHR;
}

instanceCi.enabledLayerCount = instanceLayers.Count;
if (instanceLayers.Count > 0) instanceCi.ppEnabledLayerNames = (byte**)instanceLayers.Data;

Expand Down