diff options
| author | avanspector <94762082+avanspector@users.noreply.github.com> | 2024-08-26 21:00:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-26 21:00:25 +0200 |
| commit | dd86a8f01398a2da08f8eb4495049f081901332c (patch) | |
| tree | a61857b497a824e5a7edf59bf60efef4e799e081 | |
| parent | 43ec2b9253379d03b69f40b57ef2aafd2c968416 (diff) | |
| parent | 60cd0da2ede99ae8fe2cecd002a51ed2242c5943 (diff) | |
Merge branch 'odin-lang:master' into master
| -rw-r--r-- | vendor/sdl2/sdl2.odin | 6 | ||||
| -rw-r--r-- | vendor/wgpu/sdl2glue/glue_linux.odin | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/vendor/sdl2/sdl2.odin b/vendor/sdl2/sdl2.odin index 73d95e18a..b23389a64 100644 --- a/vendor/sdl2/sdl2.odin +++ b/vendor/sdl2/sdl2.odin @@ -41,6 +41,12 @@ MAJOR_VERSION :: 2 MINOR_VERSION :: 0 PATCHLEVEL :: 16 +VERSION :: proc "contextless" (ver: ^version) { + ver.major = MAJOR_VERSION + ver.minor = MINOR_VERSION + ver.patch = PATCHLEVEL +} + @(default_calling_convention="c", link_prefix="SDL_") foreign lib { GetVersion :: proc(ver: ^version) --- diff --git a/vendor/wgpu/sdl2glue/glue_linux.odin b/vendor/wgpu/sdl2glue/glue_linux.odin index 0d1573d12..58ec90499 100644 --- a/vendor/wgpu/sdl2glue/glue_linux.odin +++ b/vendor/wgpu/sdl2glue/glue_linux.odin @@ -5,7 +5,7 @@ import "vendor:wgpu" GetSurface :: proc(instance: wgpu.Instance, window: ^sdl2.Window) -> wgpu.Surface { window_info: sdl2.SysWMinfo - sdl2.GetVersion(&window_info.version) + sdl2.VERSION(&window_info.version) sdl2.GetWindowWMInfo(window, &window_info) if window_info.subsystem == .WAYLAND { |