Browse Source

Merge pull request #2891 from flysand7/glfw-fixes

GLFW binding fixes
gingerBill 1 year ago
parent
commit
0a492acaa1
3 changed files with 15 additions and 3 deletions
  1. 1 1
      vendor/glfw/bindings/bindings.odin
  2. 1 1
      vendor/glfw/bindings/types.odin
  3. 13 1
      vendor/glfw/wrapper.odin

+ 1 - 1
vendor/glfw/bindings/bindings.odin

@@ -39,7 +39,7 @@ when ODIN_OS == .Windows {
 /*** Functions ***/
 @(default_calling_convention="c", link_prefix="glfw")
 foreign glfw {
-	Init      :: proc() -> c.int ---
+	Init      :: proc() -> b32 ---
 	Terminate :: proc() ---
 	
 	InitHint  :: proc(hint, value: c.int) ---

+ 1 - 1
vendor/glfw/bindings/types.odin

@@ -41,7 +41,7 @@ WindowMaximizeProc     :: #type proc "c" (window: WindowHandle, iconified: c.int
 WindowContentScaleProc :: #type proc "c" (window: WindowHandle, xscale, yscale: f32)
 FramebufferSizeProc    :: #type proc "c" (window: WindowHandle, width, height: c.int)
 DropProc               :: #type proc "c" (window: WindowHandle, count: c.int, paths: [^]cstring)
-MonitorProc            :: #type proc "c" (window: WindowHandle)
+MonitorProc            :: #type proc "c" (window: WindowHandle, event: c.int)
 
 KeyProc                :: #type proc "c" (window: WindowHandle, key, scancode, action, mods: c.int)
 MouseButtonProc        :: #type proc "c" (window: WindowHandle, button, action, mods: c.int)

+ 13 - 1
vendor/glfw/wrapper.odin

@@ -49,7 +49,19 @@ SetGammaRamp :: glfw.SetGammaRamp
 CreateWindow  :: glfw.CreateWindow
 DestroyWindow :: glfw.DestroyWindow
 
-WindowHint         :: glfw.WindowHint
+WindowHint_int :: proc "contextless" (hint: c.int, value: c.int) {
+	glfw.WindowHint(hint, value)
+}
+
+WindowHint_bool :: proc "contextless" (hint: c.int, value: b32) {
+	glfw.WindowHint(hint, cast(c.int) value)
+}
+
+WindowHint :: proc {
+	WindowHint_int,
+	WindowHint_bool,
+}
+
 DefaultWindowHints :: glfw.DefaultWindowHints
 WindowHintString   :: glfw.WindowHintString
 WindowShouldClose  :: glfw.WindowShouldClose