zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: revive wayland

Browse source
This commit is contained in:
Ali Cheraghi 2024-07-13 19:01:22 +03:30 • committed by Stephen Gutekanst
parent 0023ab14fb
commit 3fa889b136
6 changed files with 650 additions and 1022 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/sysgpu/vulkan.zig
View file

@ -135,8 +135,7 @@ pub const Instance = struct {
vk.extensions.khr_surface.name,
vk.extensions.khr_xlib_surface.name,
vk.extensions.khr_xcb_surface.name,
// TODO: renderdoc will not work with this extension
// vk.extensions.khr_wayland_surface.name,
vk.extensions.khr_wayland_surface.name,
},
.windows => &.{
vk.extensions.khr_surface.name,
@ -400,17 +399,14 @@ pub const Surface = struct {
null,
);
} else if (utils.findChained(sysgpu.Surface.DescriptorFromWaylandSurface, desc.next_in_chain.generic)) |wayland_desc| {
_ = wayland_desc;
@panic("unimplemented");
// TODO: renderdoc will not work with wayland
// break :blk try vki.createWaylandSurfaceKHR(
// vk_instance,
// &vk.WaylandSurfaceCreateInfoKHR{
// .display = @ptrCast(wayland_desc.display),
// .surface = @ptrCast(wayland_desc.surface),
// },
// null,
// );
break :blk try vki.createWaylandSurfaceKHR(
vk_instance,
&vk.WaylandSurfaceCreateInfoKHR{
.display = @ptrCast(wayland_desc.display),
.surface = @ptrCast(wayland_desc.surface),
},
null,
);
}
return error.InvalidDescriptor;

3
src/sysgpu/vulkan/proc.zig
View file

@ -17,8 +17,7 @@ pub const InstanceFunctions = vk.InstanceWrapper(&.{
.{
.instance_commands = .{
.createDevice = true,
// TODO: renderdoc will not work with wayland
// .createWaylandSurfaceKHR = builtin.target.os.tag == .linux,
.createWaylandSurfaceKHR = builtin.target.os.tag == .linux,
.createWin32SurfaceKHR = builtin.target.os.tag == .windows,
.createXlibSurfaceKHR = builtin.target.os.tag == .linux,
.destroyInstance = true,