Update gl_get_proc function

- SDL3 compat
- Use WINFUNCTYPE (stdcall) on win32
- Use ctypes._FuncPointer in stubs

Author: yunline

buildconfig/stubs/pygame/display.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Iterable
-from typing import Optional, Union, overload, Literal, Any
+from ctypes import _FuncPointer
+from typing import Optional, Union, overload, Literal
 from typing_extensions import deprecated # added in 3.13
 
 from pygame.constants import FULLSCREEN
@@ -70,7 +71,7 @@ def mode_ok(
 ) -> int: ...
 def gl_get_attribute(flag: int, /) -> int: ...
 def gl_set_attribute(flag: int, value: int, /) -> None: ...
-def gl_get_proc(proc_name: str) -> Any: ...
+def gl_get_proc(proc_name: str) -> _FuncPointer: ...
 def get_active() -> bool: ...
 def iconify() -> bool: ...
 def toggle_fullscreen() -> int: ...

src_c/display.c

@@ -2938,7 +2938,7 @@ pg_message_box(PyObject *self, PyObject *arg, PyObject *kwargs)
     return NULL;
 }
 
-static PyObject *pg_proc_from_address = NULL;
+static PyObject *pg_gl_proc_from_address = NULL;
 
 static PyObject *
 pg_gl_get_proc(PyObject *self, PyObject *arg)
@@ -2951,19 +2951,24 @@ pg_gl_get_proc(PyObject *self, PyObject *arg)
         return NULL;
     }
 
-    void *proc_addr = SDL_GL_GetProcAddress(proc_name);
+#if SDL_VERSION_ATLEAST(3, 0, 0)
+    SDL_FunctionPointer proc_addr;
+#else
+    void *proc_addr;
+#endif
+    proc_addr = SDL_GL_GetProcAddress(proc_name);
     if (!proc_addr) {
         return RAISE(pgExc_SDLError, SDL_GetError());
     }
     PyObject *proc_addr_obj = PyLong_FromVoidPtr(proc_addr);
     if (!proc_addr_obj) {
         return NULL;
     }
-    if (!pg_proc_from_address) {
+    if (!pg_gl_proc_from_address) {
         return RAISE(PyExc_TypeError, "'_proc_from_address' object is NULL");
     }
     PyObject *retv =
-        PyObject_CallFunction(pg_proc_from_address, "(O)", proc_addr_obj);
+        PyObject_CallFunction(pg_gl_proc_from_address, "(O)", proc_addr_obj);
     Py_DECREF(proc_addr_obj);
     return retv;
 }
@@ -3102,9 +3107,9 @@ MODINIT_DEFINE(display)
         return NULL;
     }
 
-    pg_proc_from_address =
-        PyObject_GetAttrString(pg_ffi_module, "_proc_from_address");
-    if (!pg_proc_from_address) {
+    pg_gl_proc_from_address =
+        PyObject_GetAttrString(pg_ffi_module, "_gl_proc_from_address");
+    if (!pg_gl_proc_from_address) {
         return NULL;
     }
     Py_DECREF(pg_ffi_module);

src_py/_ffi.py

@@ -1,5 +1,9 @@
 import ctypes
+import sys
 
 
-def _proc_from_address(addr):
+def _gl_proc_from_address(addr):
+    if sys.platform == "win32":
+        # use __stdcall on win32
+        return ctypes.WINFUNCTYPE(None)(addr)
     return ctypes.CFUNCTYPE(None)(addr)