From 562cf423489b1896e50d9754f6aa6211a74cd590 Mon Sep 17 00:00:00 2001 From: Meliketoaste Date: Sat, 25 Oct 2025 15:42:04 +0000 Subject: [PATCH 1/2] Update GetPlatformDisplay and CreatePlatformWindowSurface to take in intptr_t/int inistead of i32 --- vendor/egl/egl.odin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/egl/egl.odin b/vendor/egl/egl.odin index 3421e7be5..744dd2a5d 100644 --- a/vendor/egl/egl.odin +++ b/vendor/egl/egl.odin @@ -81,12 +81,12 @@ foreign import egl "system:EGL" @(default_calling_convention="c", link_prefix="egl") foreign egl { GetDisplay :: proc(display: NativeDisplayType) -> Display --- - GetPlatformDisplay :: proc(platform: Platform, native_display: rawptr, attrib_list: ^i32) -> Display --- + GetPlatformDisplay :: proc(platform: Platform, native_display: rawptr, attrib_list: ^int) -> Display --- Initialize :: proc(display: Display, major: ^i32, minor: ^i32) -> Boolean --- BindAPI :: proc(api: u32) -> Boolean --- ChooseConfig :: proc(display: Display, attrib_list: ^i32, configs: [^]Config, config_size: i32, num_config: ^i32) -> Boolean --- CreateWindowSurface :: proc(display: Display, config: Config, native_window: NativeWindowType, attrib_list: ^i32) -> Surface --- - CreatePlatformWindowSurface :: proc(display: Display, config: Config, native_window: rawptr, attrib_list: ^i32) -> Surface --- + CreatePlatformWindowSurface :: proc(display: Display, config: Config, native_window: rawptr, attrib_list: ^int) -> Surface --- CreateContext :: proc(display: Display, config: Config, share_context: Context, attrib_list: ^i32) -> Context --- MakeCurrent :: proc(display: Display, draw: Surface, read: Surface, ctx: Context) -> Boolean --- QuerySurface :: proc(display: Display, surface: Surface, attribute: i32, value: ^i32) -> Boolean --- From 78c3a3301c143bcf8cd5830150265ee80e3beb67 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Mon, 27 Oct 2025 14:04:51 +0000 Subject: [PATCH 2/2] Change `static_assert` for `OrderedInsertPtrMapEntry` --- src/ptr_map.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ptr_map.cpp b/src/ptr_map.cpp index 932f05d69..6ee3ec16d 100644 --- a/src/ptr_map.cpp +++ b/src/ptr_map.cpp @@ -467,7 +467,8 @@ struct MapFindResult { template struct OrderedInsertPtrMapEntry { - static_assert(sizeof(K) == sizeof(void *), "Key size must be pointer size"); + static_assert(TypeIsPointer::value || TypeIsPtrSizedInteger::value || TypeIs64BitInteger::value, + "OrderedInsertPtrMapEntry::K must be a pointer or 8-byte integer"); K key; V value;