-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Add vulkan support for android #15588
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
src/Android/Avalonia.Android/Platform/Vulkan/VulkanNativeInterop.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
using System; | ||
using Avalonia.SourceGenerator; | ||
using Avalonia.Vulkan; | ||
|
||
namespace Avalonia.Android.Platform.Vulkan; | ||
partial class AndroidVulkanInterface | ||
{ | ||
public AndroidVulkanInterface(IVulkanInstance instance) | ||
{ | ||
Initialize(name => instance.GetInstanceProcAddress(instance.Handle, name)); | ||
} | ||
|
||
[GetProcAddress("vkCreateAndroidSurfaceKHR")] | ||
public partial int vkCreateAndroidSurfaceKHR(IntPtr instance, ref VkAndroidSurfaceCreateInfoKHR pCreateInfo, | ||
IntPtr pAllocator, out ulong pSurface); | ||
} | ||
|
||
struct VkAndroidSurfaceCreateInfoKHR | ||
{ | ||
public const uint VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR = 1000008000; | ||
public uint sType; | ||
public IntPtr pNext; | ||
public uint flags; | ||
public IntPtr window; | ||
} |
68 changes: 68 additions & 0 deletions
68
src/Android/Avalonia.Android/Platform/Vulkan/VulkanSupport.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Runtime.InteropServices; | ||
using Avalonia.Platform; | ||
using Avalonia.Vulkan; | ||
|
||
namespace Avalonia.Android.Platform.Vulkan | ||
{ | ||
internal class VulkanSupport | ||
{ | ||
[DllImport("libvulkan.so")] | ||
private static extern IntPtr vkGetInstanceProcAddr(IntPtr instance, string name); | ||
|
||
public static VulkanPlatformGraphics? TryInitialize(VulkanOptions options) => | ||
VulkanPlatformGraphics.TryCreate(options ?? new(), new VulkanPlatformSpecificOptions | ||
{ | ||
RequiredInstanceExtensions = { "VK_KHR_android_surface" }, | ||
GetProcAddressDelegate = vkGetInstanceProcAddr, | ||
PlatformFeatures = new Dictionary<Type, object> | ||
{ | ||
[typeof(IVulkanKhrSurfacePlatformSurfaceFactory)] = new VulkanSurfaceFactory() | ||
} | ||
}); | ||
|
||
internal class VulkanSurfaceFactory : IVulkanKhrSurfacePlatformSurfaceFactory | ||
{ | ||
public bool CanRenderToSurface(IVulkanPlatformGraphicsContext context, object surface) => | ||
surface is INativePlatformHandleSurface handle; | ||
|
||
public IVulkanKhrSurfacePlatformSurface CreateSurface(IVulkanPlatformGraphicsContext context, object handle) => | ||
new AndroidVulkanSurface((INativePlatformHandleSurface)handle); | ||
} | ||
|
||
class AndroidVulkanSurface : IVulkanKhrSurfacePlatformSurface | ||
{ | ||
private INativePlatformHandleSurface _handle; | ||
|
||
public AndroidVulkanSurface(INativePlatformHandleSurface handle) | ||
{ | ||
_handle = handle; | ||
} | ||
|
||
public double Scaling => _handle.Scaling; | ||
public PixelSize Size => _handle.Size; | ||
public ulong CreateSurface(IVulkanPlatformGraphicsContext context) => | ||
CreateAndroidSurface(_handle.Handle, context.Instance); | ||
|
||
public void Dispose() | ||
{ | ||
// No-op | ||
} | ||
} | ||
|
||
private static ulong CreateAndroidSurface(nint handle, IVulkanInstance instance) | ||
{ | ||
var vulkanAndroid = new AndroidVulkanInterface(instance); | ||
var createInfo = new VkAndroidSurfaceCreateInfoKHR() | ||
{ | ||
|
||
sType = VkAndroidSurfaceCreateInfoKHR.VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR, | ||
window = handle | ||
}; | ||
VulkanException.ThrowOnError("vkCreateAndroidSurfaceKHR", | ||
vulkanAndroid.vkCreateAndroidSurfaceKHR(instance.Handle, ref createInfo, IntPtr.Zero, out var surface)); | ||
return surface; | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The spacing in that enum was inconsistent. I added the new line to match the rest of the enum