Fix indentation and add full example

This commit is contained in:
Emir
2024-07-24 10:22:18 +03:00
parent f9ef951b22
commit 2a2bedc85c
9 changed files with 266 additions and 108 deletions
+9 -9
View File
@@ -6,14 +6,14 @@ import CA "vendor:darwin/QuartzCore"
import NS "core:sys/darwin/Foundation"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surface {
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
ns_window := cast(^NS.Window)window_info.info.cocoa.window
metal_layer := CA.MetalLayer_layer()
ns_window->contentView()->setLayer(metal_layer)
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
ns_window := cast(^NS.Window)window_info.info.cocoa.window
metal_layer := CA.MetalLayer_layer()
ns_window->contentView()->setLayer(metal_layer)
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromMetalLayer{
chain = wgpu.ChainedStruct{
sType = .SurfaceDescriptorFromMetalLayer,
@@ -21,5 +21,5 @@ GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surfac
layer = rawptr(metal_layer),
},
},
)
)
}
+33 -33
View File
@@ -4,39 +4,39 @@ import "vendor:sdl2"
import "vendor:wgpu"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surface {
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
if window_info.subsystem == .WAYLAND {
display := window_info.info.wl.display
surface := window_info.info.wl.surface
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromWaylandSurface{
chain = {
sType = .SurfaceDescriptorFromWaylandSurface,
},
display = display,
surface = surface,
},
},
)
display := window_info.info.wl.display
surface := window_info.info.wl.surface
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromWaylandSurface{
chain = {
sType = .SurfaceDescriptorFromWaylandSurface,
},
display = display,
surface = surface,
},
},
)
} else if window_info.subsystem == .X11 {
display := window_info.info.x11.display
window := window_info.info.x11.window
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromXlibWindow{
chain = {
sType = .SurfaceDescriptorFromXlibWindow,
},
display = display,
window = u64(window),
},
},
)
} else {
panic("wgpu sdl2 glue: unsupported platform, expected Wayland or X11")
}
display := window_info.info.x11.display
window := window_info.info.x11.window
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromXlibWindow{
chain = {
sType = .SurfaceDescriptorFromXlibWindow,
},
display = display,
window = u64(window),
},
},
)
} else {
panic("wgpu sdl2 glue: unsupported platform, expected Wayland or X11")
}
}
+13 -13
View File
@@ -2,24 +2,24 @@ package wgpu_sdl2_glue
import win "core:sys/windows"
import "vendor:sdl2"
import "vendor:wgpu"
import "vendor:sdl2"
import "vendor:wgpu"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surface {
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
hwnd := cast(win.HWND)window_info.info.win.window
hinstance := win.GetModuleHandleW(nil)
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromMetalLayer{
window_info: sdl2.SysWMinfo
sdl2.GetWindowWMInfo(window, &window_info)
hwnd := window_info.info.win.window
hinstance := win.GetModuleHandleW(nil)
return wgpu.InstanceCreateSurface(
instance,
&wgpu.SurfaceDescriptor{
nextInChain = &wgpu.SurfaceDescriptorFromWindowsHWND{
chain = wgpu.ChainedStruct{
sType = .SurfaceDescriptorFromMetalLayer,
sType = .SurfaceDescriptorFromWindowsHWND,
},
hinstance = rawptr(hinstance),
hwnd = rawptr(hwnd),
},
},
)
}
)
}