From afccd4b0e52f780068a0a16c36526aefc3514b8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josip=20Komljenovi=C4=87?= <josipkoma@gmail.com>
Date: Mon, 3 Feb 2025 12:48:13 +0100
Subject: [PATCH] Add interface for _sdl2.video classes

---
 src_c/renderer.c       | 31 ++++++++++++++++++++++++++++---
 src_c/renderer_image.c | 19 -------------------
 src_c/texture.c        | 19 -------------------
 3 files changed, 28 insertions(+), 41 deletions(-)
 delete mode 100644 src_c/renderer_image.c
 delete mode 100644 src_c/texture.c

diff --git a/src_c/renderer.c b/src_c/renderer.c
index 0ea397427f..8b0c0072e0 100644
--- a/src_c/renderer.c
+++ b/src_c/renderer.c
@@ -6,15 +6,24 @@
 
 #include "doc/sdl2_video_doc.h"
 
-#include "texture.c"
-#include "renderer_image.c"
-
 static PyTypeObject pgRenderer_Type;
 
+static PyTypeObject pgTexture_Type;
+
+static PyTypeObject pgImage_Type;
+
 static PyMethodDef renderer_methods[] = {{NULL, NULL, 0, NULL}};
 
 static PyGetSetDef renderer_getset[] = {{NULL, 0, NULL, NULL, NULL}};
 
+static PyMethodDef texture_methods[] = {{NULL, NULL, 0, NULL}};
+
+static PyGetSetDef texture_getset[] = {{NULL, 0, NULL, NULL, NULL}};
+
+static PyMethodDef image_methods[] = {{NULL, NULL, 0, NULL}};
+
+static PyGetSetDef image_getset[] = {{NULL, 0, NULL, NULL, NULL}};
+
 static PyTypeObject pgRenderer_Type = {
     PyVarObject_HEAD_INIT(NULL, 0).tp_name = "pygame._renderer.Renderer",
     .tp_basicsize = sizeof(pgRendererObject),
@@ -23,6 +32,22 @@ static PyTypeObject pgRenderer_Type = {
     //.tp_init = (initproc)renderer_init,
     .tp_new = PyType_GenericNew, .tp_getset = renderer_getset};
 
+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};
+
+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};
+
 static PyMethodDef _renderer_methods[] = {{NULL, NULL, 0, NULL}};
 
 MODINIT_DEFINE(_renderer)
diff --git a/src_c/renderer_image.c b/src_c/renderer_image.c
deleted file mode 100644
index 49831fec2a..0000000000
--- a/src_c/renderer_image.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "pygame.h"
-
-#include "pgcompat.h"
-
-#include "doc/sdl2_video_doc.h"
-
-static PyTypeObject pgImage_Type;
-
-static PyMethodDef image_methods[] = {{NULL, NULL, 0, NULL}};
-
-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};
diff --git a/src_c/texture.c b/src_c/texture.c
deleted file mode 100644
index a8a82c2cf3..0000000000
--- a/src_c/texture.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "pygame.h"
-
-#include "pgcompat.h"
-
-#include "doc/sdl2_video_doc.h"
-
-static PyTypeObject pgTexture_Type;
-
-static PyMethodDef texture_methods[] = {{NULL, NULL, 0, NULL}};
-
-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};