From cac8582de17762319ad8da1e509f9aff9d7a241b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Prokop=20Rand=C3=A1=C4=8Dek?= Date: Sun, 24 Oct 2021 12:52:54 +0200 Subject: [PATCH 1/2] WindowShouldClose should return a bool --- vendor/glfw/wrapper.odin | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vendor/glfw/wrapper.odin b/vendor/glfw/wrapper.odin index 2eed82efe..853917661 100644 --- a/vendor/glfw/wrapper.odin +++ b/vendor/glfw/wrapper.odin @@ -52,7 +52,9 @@ DestroyWindow :: glfw.DestroyWindow WindowHint :: glfw.WindowHint DefaultWindowHints :: glfw.DefaultWindowHints WindowHintString :: glfw.WindowHintString -WindowShouldClose :: glfw.WindowShouldClose +WindowShouldClose :: proc "c" (window: WindowHandle) -> bool { + return glfw.WindowShouldClose(window) != 0 +} SwapInterval :: glfw.SwapInterval SwapBuffers :: glfw.SwapBuffers @@ -228,4 +230,4 @@ SetErrorCallback :: glfw.SetErrorCallback // Used by vendor:OpenGL gl_set_proc_address :: proc(p: rawptr, name: cstring) { (^rawptr)(p)^ = GetProcAddress(name) -} \ No newline at end of file +} From b77e2f59ed17c2cdadf218603281ef9709192306 Mon Sep 17 00:00:00 2001 From: Prokop Randacek Date: Sun, 24 Oct 2021 13:07:13 +0200 Subject: [PATCH 2/2] The better option --- vendor/glfw/bindings/bindings.odin | 2 +- vendor/glfw/wrapper.odin | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vendor/glfw/bindings/bindings.odin b/vendor/glfw/bindings/bindings.odin index e65e9b2fc..90d5a0f9e 100644 --- a/vendor/glfw/bindings/bindings.odin +++ b/vendor/glfw/bindings/bindings.odin @@ -46,7 +46,7 @@ foreign glfw { WindowHint :: proc(hint, value: c.int) --- DefaultWindowHints :: proc() --- WindowHintString :: proc(hint: c.int, value: cstring) --- - WindowShouldClose :: proc(window: WindowHandle) -> c.int --- + WindowShouldClose :: proc(window: WindowHandle) -> b32 --- SwapInterval :: proc(interval: c.int) --- SwapBuffers :: proc(window: WindowHandle) --- diff --git a/vendor/glfw/wrapper.odin b/vendor/glfw/wrapper.odin index 853917661..2c09731ca 100644 --- a/vendor/glfw/wrapper.odin +++ b/vendor/glfw/wrapper.odin @@ -52,9 +52,7 @@ DestroyWindow :: glfw.DestroyWindow WindowHint :: glfw.WindowHint DefaultWindowHints :: glfw.DefaultWindowHints WindowHintString :: glfw.WindowHintString -WindowShouldClose :: proc "c" (window: WindowHandle) -> bool { - return glfw.WindowShouldClose(window) != 0 -} +WindowShouldClose :: glfw.WindowShouldClose SwapInterval :: glfw.SwapInterval SwapBuffers :: glfw.SwapBuffers