From ace591cfa29e7b3717f27e5458b6ccea7e432f77 Mon Sep 17 00:00:00 2001 From: "Paul m. p. Peny" Date: Thu, 23 Nov 2023 00:51:10 +0100 Subject: [PATCH 1/3] C loader targets a python alias which is not yet available when using static loader. https://github.com/pygame-community/pygame-ce/blob/9d69a535b2b79d115e2a7db55d35fd541b140578/src_py/__init__.py#L135 --- src_c/cython/pygame/_sdl2/video.pxd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_c/cython/pygame/_sdl2/video.pxd b/src_c/cython/pygame/_sdl2/video.pxd index bd3d5a7ac7..882d52e44e 100644 --- a/src_c/cython/pygame/_sdl2/video.pxd +++ b/src_c/cython/pygame/_sdl2/video.pxd @@ -393,7 +393,7 @@ cdef extern from "SDL.h" nogil: cdef extern from "pygame.h" nogil: - ctypedef class pygame.Color [object pgColorObject]: + ctypedef class pygame.color.Color [object pgColorObject]: cdef Uint8 data[4] cdef Uint8 len From 799ea68d208741bdc7550bcb3f992c6e42a4a275 Mon Sep 17 00:00:00 2001 From: "Paul m. p. Peny" Date: Thu, 23 Nov 2023 02:03:18 +0100 Subject: [PATCH 2/3] another alias --- src_c/cython/pygame/_sdl2/video.pxd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_c/cython/pygame/_sdl2/video.pxd b/src_c/cython/pygame/_sdl2/video.pxd index 882d52e44e..095cf2d424 100644 --- a/src_c/cython/pygame/_sdl2/video.pxd +++ b/src_c/cython/pygame/_sdl2/video.pxd @@ -404,7 +404,7 @@ cdef extern from "pygame.h" nogil: PG_COLOR_HANDLE_RESTRICT_SEQ PG_COLOR_HANDLE_ALL - ctypedef class pygame.Rect [object pgRectObject]: + ctypedef class pygame.rect.Rect [object pgRectObject]: cdef SDL_Rect r cdef object weakreflist From 01d0d82bddb46e3b28650a28e7f8cdc37a1b4f89 Mon Sep 17 00:00:00 2001 From: Starbuck5 <46412508+Starbuck5@users.noreply.github.com> Date: Fri, 24 Nov 2023 00:57:58 -0800 Subject: [PATCH 3/3] Regenerate cython after changing away from using Python aliases --- src_c/_sdl2/video.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src_c/_sdl2/video.c b/src_c/_sdl2/video.c index 5d7f2973b3..9821fb3b4e 100644 --- a/src_c/_sdl2/video.c +++ b/src_c/_sdl2/video.c @@ -2580,7 +2580,9 @@ static PyObject *__pyx_f_6pygame_5_sdl2_5video_8Renderer_blit(struct __pyx_obj_6 /* Module declarations from "pygame._sdl2.sdl2" */ -/* Module declarations from "pygame" */ +/* Module declarations from "pygame.color" */ + +/* Module declarations from "pygame.rect" */ /* Module declarations from "pygame._window" */ @@ -3054,6 +3056,8 @@ typedef struct { #endif #if CYTHON_USE_MODULE_STATE #endif + #if CYTHON_USE_MODULE_STATE + #endif PyTypeObject *__pyx_ptype_7cpython_4type_type; #if CYTHON_USE_MODULE_STATE #endif @@ -4299,6 +4303,8 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) { #endif #if CYTHON_USE_MODULE_STATE #endif +#if CYTHON_USE_MODULE_STATE +#endif #define __pyx_ptype_7cpython_4type_type __pyx_mstate_global->__pyx_ptype_7cpython_4type_type #if CYTHON_USE_MODULE_STATE #endif @@ -23362,18 +23368,21 @@ static int __Pyx_modinit_type_init_code(void) { __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; + PyObject *__pyx_t_3 = NULL; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__Pyx_modinit_type_init_code", 0); /*--- Type init code ---*/ - __pyx_t_1 = PyImport_ImportModule("pygame"); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 396, __pyx_L1_error) + __pyx_t_1 = PyImport_ImportModule("pygame.color"); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 396, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_ptype_6pygame_5_sdl2_5video_Color = __Pyx_ImportType_3_0_0(__pyx_t_1, "pygame", "Color", sizeof(pgColorObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_0(pgColorObject),__Pyx_ImportType_CheckSize_Warn_3_0_0); if (!__pyx_ptype_6pygame_5_sdl2_5video_Color) __PYX_ERR(2, 396, __pyx_L1_error) - __pyx_ptype_6pygame_5_sdl2_5video_Rect = __Pyx_ImportType_3_0_0(__pyx_t_1, "pygame", "Rect", sizeof(pgRectObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_0(pgRectObject),__Pyx_ImportType_CheckSize_Warn_3_0_0); if (!__pyx_ptype_6pygame_5_sdl2_5video_Rect) __PYX_ERR(2, 407, __pyx_L1_error) - __pyx_t_2 = PyImport_ImportModule("pygame._window"); if (unlikely(!__pyx_t_2)) __PYX_ERR(2, 411, __pyx_L1_error) + __pyx_ptype_6pygame_5_sdl2_5video_Color = __Pyx_ImportType_3_0_0(__pyx_t_1, "pygame.color", "Color", sizeof(pgColorObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_0(pgColorObject),__Pyx_ImportType_CheckSize_Warn_3_0_0); if (!__pyx_ptype_6pygame_5_sdl2_5video_Color) __PYX_ERR(2, 396, __pyx_L1_error) + __pyx_t_2 = PyImport_ImportModule("pygame.rect"); if (unlikely(!__pyx_t_2)) __PYX_ERR(2, 407, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_ptype_6pygame_5_sdl2_5video_Window = __Pyx_ImportType_3_0_0(__pyx_t_2, "pygame._window", "Window", sizeof(pgWindowObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_0(pgWindowObject),__Pyx_ImportType_CheckSize_Warn_3_0_0); if (!__pyx_ptype_6pygame_5_sdl2_5video_Window) __PYX_ERR(2, 411, __pyx_L1_error) + __pyx_ptype_6pygame_5_sdl2_5video_Rect = __Pyx_ImportType_3_0_0(__pyx_t_2, "pygame.rect", "Rect", sizeof(pgRectObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_0(pgRectObject),__Pyx_ImportType_CheckSize_Warn_3_0_0); if (!__pyx_ptype_6pygame_5_sdl2_5video_Rect) __PYX_ERR(2, 407, __pyx_L1_error) + __pyx_t_3 = PyImport_ImportModule("pygame._window"); if (unlikely(!__pyx_t_3)) __PYX_ERR(2, 411, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_3); + __pyx_ptype_6pygame_5_sdl2_5video_Window = __Pyx_ImportType_3_0_0(__pyx_t_3, "pygame._window", "Window", sizeof(pgWindowObject), __PYX_GET_STRUCT_ALIGNMENT_3_0_0(pgWindowObject),__Pyx_ImportType_CheckSize_Warn_3_0_0); if (!__pyx_ptype_6pygame_5_sdl2_5video_Window) __PYX_ERR(2, 411, __pyx_L1_error) __pyx_vtabptr_6pygame_5_sdl2_5video_Renderer = &__pyx_vtable_6pygame_5_sdl2_5video_Renderer; __pyx_vtable_6pygame_5_sdl2_5video_Renderer.get_viewport = (PyObject *(*)(struct __pyx_obj_6pygame_5_sdl2_5video_Renderer *, int __pyx_skip_dispatch))__pyx_f_6pygame_5_sdl2_5video_8Renderer_get_viewport; __pyx_vtable_6pygame_5_sdl2_5video_Renderer.blit = (PyObject *(*)(struct __pyx_obj_6pygame_5_sdl2_5video_Renderer *, PyObject *, int __pyx_skip_dispatch, struct __pyx_opt_args_6pygame_5_sdl2_5video_8Renderer_blit *__pyx_optional_args))__pyx_f_6pygame_5_sdl2_5video_8Renderer_blit; @@ -23505,11 +23514,13 @@ static int __Pyx_modinit_type_init_code(void) { #endif __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_RefNannyFinishContext(); return 0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_2); + __Pyx_XDECREF(__pyx_t_3); __Pyx_RefNannyFinishContext(); return -1; }