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

gpu: rename Surface.Descriptor.xlib_window -> xlib

Browse source 
To appropriately match the upstream, webgpu.h, which has renamed in this way.

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-03-08 19:40:33 -07:00 • committed by Stephen Gutekanst
parent 0be5cae328
commit 99744134f8
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gpu/examples/sample_utils.zig
View file

@ -175,7 +175,7 @@ pub fn createSurfaceForWindow(
.hwnd = glfw_native.getWin32Window(window), .hwnd = glfw_native.getWin32Window(window),
}, },
} else if (glfw_options.x11) gpu.Surface.Descriptor{ } else if (glfw_options.x11) gpu.Surface.Descriptor{
.xlib_window = .{ .xlib = .{
.label = "basic surface", .label = "basic surface",
.display = glfw_native.getX11Display(), .display = glfw_native.getX11Display(),
.window = glfw_native.getX11Window(window), .window = glfw_native.getX11Window(window),

2
gpu/src/NativeInstance.zig
View file

@ -141,7 +141,7 @@ pub fn createSurface(native: *const NativeInstance, descriptor: *const Surface.D
.label = if (src.label) |l| @ptrCast([*c]const u8, l) else null, .label = if (src.label) |l| @ptrCast([*c]const u8, l) else null,
}); });
}, },
.xlib_window => |src| blk: { .xlib => |src| blk: {
var desc: c.WGPUSurfaceDescriptorFromXlibWindow = undefined; var desc: c.WGPUSurfaceDescriptorFromXlibWindow = undefined;
desc.chain.next = null; desc.chain.next = null;
desc.chain.sType = c.WGPUSType_SurfaceDescriptorFromXlibWindow; desc.chain.sType = c.WGPUSType_SurfaceDescriptorFromXlibWindow;

4
gpu/src/Surface.zig
View file

@ -25,7 +25,7 @@ pub const DescriptorTag = enum {
windows_hwnd, windows_hwnd,
windows_core_window, windows_core_window,
windows_swap_chain_panel, windows_swap_chain_panel,
xlib_window, xlib,
canvas_html_selector, canvas_html_selector,
}; };
@ -48,7 +48,7 @@ pub const Descriptor = union(DescriptorTag) {
label: ?[]const u8, label: ?[]const u8,
swap_chain_panel: *anyopaque, swap_chain_panel: *anyopaque,
}, },
xlib_window: struct { xlib: struct {
label: ?[]const u8, label: ?[]const u8,
display: *anyopaque, display: *anyopaque,
window: u32, window: u32,