ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:odin-lang/Odin

Browse Source
This commit is contained in:
Jeroen van Rijn
2025-10-27 16:24:04 +01:00
parent f726f7aff4 d9d7711ca4
commit 788ef8ee0a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ptr_map.cpp
+2 -1
View File
@@ -467,7 +467,8 @@ struct MapFindResult {
template <typename K, typename V> template <typename K, typename V>
struct OrderedInsertPtrMapEntry { 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; K key;
V value; V value;
vendor/egl/egl.odin
Vendored
+2 -2
View File
@@ -81,12 +81,12 @@ foreign import egl "system:EGL"
@(default_calling_convention="c", link_prefix="egl") @(default_calling_convention="c", link_prefix="egl")
foreign egl { foreign egl {
GetDisplay :: proc(display: NativeDisplayType) -> Display --- 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 --- Initialize :: proc(display: Display, major: ^i32, minor: ^i32) -> Boolean ---
BindAPI :: proc(api: u32) -> Boolean --- BindAPI :: proc(api: u32) -> Boolean ---
ChooseConfig :: proc(display: Display, attrib_list: ^i32, configs: [^]Config, config_size: i32, num_config: ^i32) -> 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 --- 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 --- CreateContext :: proc(display: Display, config: Config, share_context: Context, attrib_list: ^i32) -> Context ---
MakeCurrent :: proc(display: Display, draw: Surface, read: Surface, ctx: Context) -> Boolean --- MakeCurrent :: proc(display: Display, draw: Surface, read: Surface, ctx: Context) -> Boolean ---
QuerySurface :: proc(display: Display, surface: Surface, attribute: i32, value: ^i32) -> Boolean --- QuerySurface :: proc(display: Display, surface: Surface, attribute: i32, value: ^i32) -> Boolean ---