From 702958c883149d4321fe96eab6de2ecbbae5cf31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Komljenovi=C4=87?= Date: Wed, 29 Jan 2025 15:38:01 +0100 Subject: [PATCH] Add interface for _sdl2.video classes --- src_c/include/_pygame.h | 3 +-- src_c/renderer.c | 13 +++++-------- src_c/renderer_image.c | 13 +++++-------- src_c/texture.c | 13 +++++-------- 4 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src_c/include/_pygame.h b/src_c/include/_pygame.h index d7a6f292f9..6858f270f7 100644 --- a/src_c/include/_pygame.h +++ b/src_c/include/_pygame.h @@ -559,8 +559,7 @@ typedef struct { (PyObject_IsInstance((x), (PyObject *)&pgRenderer_Type)) #define pgTexture_Check(x) \ (PyObject_IsInstance((x), (PyObject *)&pgTexture_Type)) -#define pgImage_Check(x) \ - (PyObject_IsInstance((x), (PyObject *)&pgImage_Type)) +#define pgImage_Check(x) (PyObject_IsInstance((x), (PyObject *)&pgImage_Type)) #define import_pygame_renderer() IMPORT_PYGAME_MODULE(_renderer) #endif diff --git a/src_c/renderer.c b/src_c/renderer.c index 92c381d1ac..0ea397427f 100644 --- a/src_c/renderer.c +++ b/src_c/renderer.c @@ -17,14 +17,11 @@ static PyGetSetDef renderer_getset[] = {{NULL, 0, NULL, NULL, NULL}}; static PyTypeObject pgRenderer_Type = { PyVarObject_HEAD_INIT(NULL, 0).tp_name = "pygame._renderer.Renderer", - .tp_basicsize = sizeof(pgRendererObject), - //.tp_dealloc = (destructor)renderer_dealloc, - .tp_doc = DOC_SDL2_VIDEO_RENDERER, - .tp_methods = renderer_methods, - //.tp_init = (initproc)renderer_init, - .tp_new = PyType_GenericNew, - .tp_getset = renderer_getset -}; + .tp_basicsize = sizeof(pgRendererObject), + //.tp_dealloc = (destructor)renderer_dealloc, + .tp_doc = DOC_SDL2_VIDEO_RENDERER, .tp_methods = renderer_methods, + //.tp_init = (initproc)renderer_init, + .tp_new = PyType_GenericNew, .tp_getset = renderer_getset}; static PyMethodDef _renderer_methods[] = {{NULL, NULL, 0, NULL}}; diff --git a/src_c/renderer_image.c b/src_c/renderer_image.c index 15d2bbea46..af2ac4ff7c 100644 --- a/src_c/renderer_image.c +++ b/src_c/renderer_image.c @@ -12,13 +12,10 @@ static PyGetSetDef image_getset[] = {{NULL, 0, NULL, NULL, NULL}}; static PyTypeObject pgImage_Type = { PyVarObject_HEAD_INIT(NULL, 0).tp_name = "pygame._renderer.Image", - .tp_basicsize = sizeof(pgImageObject), - //.tp_dealloc = (destructor)image_dealloc, - .tp_doc = DOC_SDL2_VIDEO_IMAGE, - .tp_methods = image_methods, - //.tp_init = (initproc)image_init, - .tp_new = PyType_GenericNew, - .tp_getset = image_getset -}; + .tp_basicsize = sizeof(pgImageObject), + //.tp_dealloc = (destructor)image_dealloc, + .tp_doc = DOC_SDL2_VIDEO_IMAGE, .tp_methods = image_methods, + //.tp_init = (initproc)image_init, + .tp_new = PyType_GenericNew, .tp_getset = image_getset}; static PyMethodDef _image_methods[] = {{NULL, NULL, 0, NULL}}; diff --git a/src_c/texture.c b/src_c/texture.c index 48d1775497..3ea5bc3d4b 100644 --- a/src_c/texture.c +++ b/src_c/texture.c @@ -12,13 +12,10 @@ static PyGetSetDef texture_getset[] = {{NULL, 0, NULL, NULL, NULL}}; static PyTypeObject pgTexture_Type = { PyVarObject_HEAD_INIT(NULL, 0).tp_name = "pygame._renderer.Texture", - .tp_basicsize = sizeof(pgTextureObject), - //.tp_dealloc = (destructor)texture_dealloc, - .tp_doc = DOC_SDL2_VIDEO_TEXTURE, - .tp_methods = texture_methods, - //.tp_init = (initproc)texture_init, - .tp_new = PyType_GenericNew, - .tp_getset = texture_getset -}; + .tp_basicsize = sizeof(pgTextureObject), + //.tp_dealloc = (destructor)texture_dealloc, + .tp_doc = DOC_SDL2_VIDEO_TEXTURE, .tp_methods = texture_methods, + //.tp_init = (initproc)texture_init, + .tp_new = PyType_GenericNew, .tp_getset = texture_getset}; static PyMethodDef _texture_methods[] = {{NULL, NULL, 0, NULL}};