diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2025-10-27 16:24:04 +0100 |
|---|---|---|
| committer | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2025-10-27 16:24:04 +0100 |
| commit | 788ef8ee0a42e72d82982700422b78f70b0d4875 (patch) | |
| tree | 96b2e455d281ce76d172a6b5d0a4deeba6dfa82e | |
| parent | f726f7aff4fca97afb348727cd26e56be2d0cb97 (diff) | |
| parent | d9d7711ca4cf3fb94f4606e91f052fdb7ca885a3 (diff) | |
Merge branch 'master' of github.com:odin-lang/Odin
| -rw-r--r-- | src/ptr_map.cpp | 3 | ||||
| -rw-r--r-- | vendor/egl/egl.odin | 4 |
2 files changed, 4 insertions, 3 deletions
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 <typename K, typename V> struct OrderedInsertPtrMapEntry { - static_assert(sizeof(K) == sizeof(void *), "Key size must be pointer size"); + static_assert(TypeIsPointer<K>::value || TypeIsPtrSizedInteger<K>::value || TypeIs64BitInteger<K>::value, + "OrderedInsertPtrMapEntry::K must be a pointer or 8-byte integer"); K key; V value; 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 --- |