Skip to content

Commit

Permalink
egl: fix crash in EglGetProcAddress on Win32-x86 platform
Browse files Browse the repository at this point in the history
Change the calling convention of the `EglGetProcAddress` declaration to `extern "system"`
to automatically use the correct calling convention for the platform.
  • Loading branch information
varphone authored Aug 26, 2024
1 parent 90ebeb5 commit d9c2083
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Unreleased

- Fixed EGL's `Device::query_devices()` being too strict about required extensions
- Fixed crash in `EglGetProcAddress` on Win32-x86 platform due to wrong calling convention

# Version 0.32.0

Expand Down
2 changes: 1 addition & 1 deletion glutin/src/api/egl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub(crate) static EGL: Lazy<Option<Egl>> = Lazy::new(|| {
unsafe { SymWrapper::new(&paths).map(Egl).ok() }
});

type EglGetProcAddress = unsafe extern "C" fn(*const ffi::c_void) -> *const ffi::c_void;
type EglGetProcAddress = unsafe extern "system" fn(*const ffi::c_void) -> *const ffi::c_void;
static EGL_GET_PROC_ADDRESS: OnceCell<libloading_os::Symbol<EglGetProcAddress>> = OnceCell::new();

/// EGL interface.
Expand Down

0 comments on commit d9c2083

Please sign in to comment.