ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 22:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed many oversights

Browse Source
This commit is contained in:
Slashscreen
2025-02-12 15:06:22 -08:00
parent 02b19b115b
commit 2f82d4e325
3 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/wgpu/sdl3glue/glue_darwin.odin
Vendored
+8 -13
View File
@@ -1,22 +1,17 @@
package wgpu_sdl3_glue package wgpu_sdl3_glue
import "vendor:sdl3" import "vendor:sdl3"
import "vendor:wgpu" import "vendor:wgpu"
import CA "vendor:darwin/QuartzCore"
import NS "core:sys/darwin/Foundation"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl3.Window) -> wgpu.Surface { GetSurface :: proc(instance: wgpu.Instance, window: ^sdl3.Window) -> wgpu.Surface {
ns_window := cast(^NS.Window)sdl3.GetPointerProperty(sdl3.GetWindowProperties(window), sdl3.PROP_WINDOW_COCOA_WINDOW_POINTER, nil) view := sdl3.Metal_CreateView(window)
metal_layer := CA.MetalLayer_layer() metal_layer := sdl3.Metal_GetLayer(view)
ns_window->contentView()->setLayer(metal_layer)
return wgpu.InstanceCreateSurface( return wgpu.InstanceCreateSurface(
instance, instance,
&wgpu.SurfaceDescriptor{ &wgpu.SurfaceDescriptor {
nextInChain = &wgpu.SurfaceDescriptorFromMetalLayer{ nextInChain = &wgpu.SurfaceDescriptorFromMetalLayer {
chain = wgpu.ChainedStruct{ chain = wgpu.ChainedStruct{sType = .SurfaceDescriptorFromMetalLayer},
sType = .SurfaceDescriptorFromMetalLayer, layer = metal_layer,
},
layer = rawptr(metal_layer),
}, },
}, },
) )
vendor/wgpu/sdl3glue/glue_linux.odin
Vendored
+31 -22
View File
@@ -3,43 +3,52 @@ package wgpu_sdl3_glue
import "vendor:sdl3" import "vendor:sdl3"
import "vendor:wgpu" import "vendor:wgpu"
@(private="file")
DRIVER_X11: cstring = "x11"
@(private="file")
DRIVER_WAYLAND: cstring = "wayland"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl3.Window) -> wgpu.Surface { GetSurface :: proc(instance: wgpu.Instance, window: ^sdl3.Window) -> wgpu.Surface {
if sdl3.strcmp(sdl3.GetCurrentVideoDriver(), DRIVER_WAYLAND) == 0 { switch sdl3.GetCurrentVideoDriver() {
display := sdl3.GetPointerProperty(sdl3.GetWindowProperties(window), sdl3.PROP_WINDOW_X11_DISPLAY_POINTER, nil) case "x11":
surface := sdl3.GetNumberProperty(sdl3.GetWindowProperties(window), sdl3.PROP_WINDOW_X11_WINDOW_NUMBER, 0) display := sdl3.GetPointerProperty(
sdl3.GetWindowProperties(window),
sdl3.PROP_WINDOW_X11_DISPLAY_POINTER,
nil,
)
surface := sdl3.GetNumberProperty(
sdl3.GetWindowProperties(window),
sdl3.PROP_WINDOW_X11_WINDOW_NUMBER,
0,
)
return wgpu.InstanceCreateSurface( return wgpu.InstanceCreateSurface(
instance, instance,
&wgpu.SurfaceDescriptor{ &wgpu.SurfaceDescriptor {
nextInChain = &wgpu.SurfaceDescriptorFromWaylandSurface{ nextInChain = &wgpu.SurfaceDescriptorFromWaylandSurface {
chain = { chain = {sType = .SurfaceDescriptorFromWaylandSurface},
sType = .SurfaceDescriptorFromWaylandSurface,
},
display = display, display = display,
surface = surface, surface = surface,
}, },
}, },
) )
} else if sdl3.strcmp(sdl3.GetCurrentVideoDriver(), DRIVER_X11) == 0 { case "wayland":
display := sdl3.GetPointerProperty(sdl3.GetWindowProperties(window), sdl3.PROP_WINDOW_WAYLAND_DISPLAY_POINTER, nil) display := sdl3.GetPointerProperty(
surface := sdl3.GetPointerProperty(sdl3.GetWindowProperties(window), sdl3.PROP_WINDOW_WAYLAND_SURFACE_POINTER, 0) sdl3.GetWindowProperties(window),
sdl3.PROP_WINDOW_WAYLAND_DISPLAY_POINTER,
nil,
)
surface := sdl3.GetPointerProperty(
sdl3.GetWindowProperties(window),
sdl3.PROP_WINDOW_WAYLAND_SURFACE_POINTER,
0,
)
return wgpu.InstanceCreateSurface( return wgpu.InstanceCreateSurface(
instance, instance,
&wgpu.SurfaceDescriptor{ &wgpu.SurfaceDescriptor {
nextInChain = &wgpu.SurfaceDescriptorFromXlibWindow{ nextInChain = &wgpu.SurfaceDescriptorFromXlibWindow {
chain = { chain = {sType = .SurfaceDescriptorFromXlibWindow},
sType = .SurfaceDescriptorFromXlibWindow,
},
display = display, display = display,
window = u64(window), window = u64(window),
}, },
}, },
) )
} else { case:
panic("wgpu sdl3 glue: unsupported platform, expected Wayland or X11") panic("wgpu sdl3 glue: unsupported platform, expected Wayland or X11")
} }
} }
vendor/wgpu/sdl3glue/glue_windows.odin
Vendored
+17 -11
View File
@@ -2,21 +2,27 @@ package wgpu_sdl3_glue
import win "core:sys/windows" import win "core:sys/windows"
import "vendor:sdl3" import "vendor:sdl3"
import "vendor:wgpu" import "vendor:wgpu"
GetSurface :: proc(instance: wgpu.Instance, window: ^sdl3.Window) -> wgpu.Surface { GetSurface :: proc(instance: wgpu.Instance, window: ^sdl3.Window) -> wgpu.Surface {
hwnd := sdl3.GetPointerProperty(sdl3.GetWindowProperties(window), sdl3.PROP_WINDOW_WIN32_HWND_POINTER, nil) hwnd := sdl3.GetPointerProperty(
hinstance := win.GetModuleHandleW(nil) sdl3.GetWindowProperties(window),
sdl3.PROP_WINDOW_WIN32_HWND_POINTER,
nil,
)
hinstance := sdl3.GetPointerProperty(
sdl3.GetWindowProperties(window),
sdl3.PROP_WINDOW_WIN32_INSTANCE_POINTER,
nil,
)
return wgpu.InstanceCreateSurface( return wgpu.InstanceCreateSurface(
instance, instance,
&wgpu.SurfaceDescriptor{ &wgpu.SurfaceDescriptor {
nextInChain = &wgpu.SurfaceDescriptorFromWindowsHWND{ nextInChain = &wgpu.SurfaceDescriptorFromWindowsHWND {
chain = wgpu.ChainedStruct{ chain = wgpu.ChainedStruct{sType = .SurfaceDescriptorFromWindowsHWND},
sType = .SurfaceDescriptorFromWindowsHWND, hinstance = hinstance,
}, hwnd = hwnd,
hinstance = rawptr(hinstance),
hwnd = rawptr(hwnd),
}, },
}, },
) )