From 99744134f8da36d498a567cb3990e8b27fcbeae5 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Tue, 8 Mar 2022 19:40:33 -0700 Subject: [PATCH] gpu: rename Surface.Descriptor.xlib_window -> xlib To appropriately match the upstream, webgpu.h, which has renamed in this way. Signed-off-by: Stephen Gutekanst --- gpu/examples/sample_utils.zig | 2 +- gpu/src/NativeInstance.zig | 2 +- gpu/src/Surface.zig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gpu/examples/sample_utils.zig b/gpu/examples/sample_utils.zig index a664ade7..d0f565df 100644 --- a/gpu/examples/sample_utils.zig +++ b/gpu/examples/sample_utils.zig @@ -175,7 +175,7 @@ pub fn createSurfaceForWindow( .hwnd = glfw_native.getWin32Window(window), }, } else if (glfw_options.x11) gpu.Surface.Descriptor{ - .xlib_window = .{ + .xlib = .{ .label = "basic surface", .display = glfw_native.getX11Display(), .window = glfw_native.getX11Window(window), diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig index c3190863..f1d5331e 100644 --- a/gpu/src/NativeInstance.zig +++ b/gpu/src/NativeInstance.zig @@ -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, }); }, - .xlib_window => |src| blk: { + .xlib => |src| blk: { var desc: c.WGPUSurfaceDescriptorFromXlibWindow = undefined; desc.chain.next = null; desc.chain.sType = c.WGPUSType_SurfaceDescriptorFromXlibWindow; diff --git a/gpu/src/Surface.zig b/gpu/src/Surface.zig index e470c125..99fd7852 100644 --- a/gpu/src/Surface.zig +++ b/gpu/src/Surface.zig @@ -25,7 +25,7 @@ pub const DescriptorTag = enum { windows_hwnd, windows_core_window, windows_swap_chain_panel, - xlib_window, + xlib, canvas_html_selector, }; @@ -48,7 +48,7 @@ pub const Descriptor = union(DescriptorTag) { label: ?[]const u8, swap_chain_panel: *anyopaque, }, - xlib_window: struct { + xlib: struct { label: ?[]const u8, display: *anyopaque, window: u32,