From c27e1249e1671209a1deeef059dfed3e18c7c15d Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain.becker@gmail.com>
Date: Mon, 20 Sep 2021 17:17:34 +0200
Subject: [PATCH] Remove SDL_HAVE_RENDER_GEOMETRY define

---
 src/SDL_internal.h                  | 6 ------
 src/render/SDL_sysrender.h          | 2 --
 src/render/software/SDL_render_sw.c | 6 ------
 src/render/software/SDL_triangle.c  | 2 +-
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/SDL_internal.h b/src/SDL_internal.h
index 6e52cd53a..660c24740 100644
--- a/src/SDL_internal.h
+++ b/src/SDL_internal.h
@@ -116,12 +116,6 @@
 #define SDL_HAVE_YUV                    !SDL_LEAN_AND_MEAN
 #endif
 
-/* SDL Renderer
-   - SDL_RenderGeometry() */
-#ifndef SDL_HAVE_RENDER_GEOMETRY
-#define SDL_HAVE_RENDER_GEOMETRY        !SDL_LEAN_AND_MEAN
-#endif
-
 #include "SDL_assert.h"
 #include "SDL_log.h"
 
diff --git a/src/render/SDL_sysrender.h b/src/render/SDL_sysrender.h
index 8a640055b..a8ed01994 100644
--- a/src/render/SDL_sysrender.h
+++ b/src/render/SDL_sysrender.h
@@ -129,12 +129,10 @@ struct SDL_Renderer
     int (*QueueCopyEx) (SDL_Renderer * renderer, SDL_RenderCommand *cmd, SDL_Texture * texture,
                         const SDL_Rect * srcquad, const SDL_FRect * dstrect,
                         const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip);
-#if SDL_HAVE_RENDER_GEOMETRY
     int (*QueueGeometry) (SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *texture,
                           const float *xy, int xy_stride, const int *color, int color_stride, const float *uv, int uv_stride,
                           int num_vertices, const void *indices, int num_indices, int size_indices,
                           float scale_x, float scale_y);
-#endif
 
     int (*RunCommandQueue) (SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertices, size_t vertsize);
     int (*UpdateTexture) (SDL_Renderer * renderer, SDL_Texture * texture,
diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index fd1c2dc55..029b387d4 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -562,7 +562,6 @@ SW_RenderCopyEx(SDL_Renderer * renderer, SDL_Surface *surface, SDL_Texture * tex
 }
 
 
-#if SDL_HAVE_RENDER_GEOMETRY
 typedef struct GeometryFillData
 {
     SDL_Point dst;
@@ -659,7 +658,6 @@ SW_QueueGeometry(SDL_Renderer *renderer, SDL_RenderCommand *cmd, SDL_Texture *te
     }
     return 0;
 }
-#endif
 
 static void
 PrepTextureForCopy(const SDL_RenderCommand *cmd)
@@ -836,7 +834,6 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
             }
 
             case SDL_RENDERCMD_GEOMETRY: {
-#if SDL_HAVE_RENDER_GEOMETRY
                 int i;
                 SDL_Rect *verts = (SDL_Rect *) (((Uint8 *) vertices) + cmd->data.draw.first);
                 const int count = (int) cmd->data.draw.count;
@@ -865,7 +862,6 @@ SW_RunCommandQueue(SDL_Renderer * renderer, SDL_RenderCommand *cmd, void *vertic
                         SDL_SW_FillTriangle(surface, &(ptr[0].dst), &(ptr[1].dst), &(ptr[2].dst), blend, ptr[0].color, ptr[1].color, ptr[2].color);
                     }
                 }
-#endif
                 break;
             }
 
@@ -978,9 +974,7 @@ SW_CreateRendererForSurface(SDL_Surface * surface)
     renderer->QueueFillRects = SW_QueueFillRects;
     renderer->QueueCopy = SW_QueueCopy;
     renderer->QueueCopyEx = SW_QueueCopyEx;
-#if SDL_HAVE_RENDER_GEOMETRY
     renderer->QueueGeometry = SW_QueueGeometry;
-#endif
     renderer->RunCommandQueue = SW_RunCommandQueue;
     renderer->RenderReadPixels = SW_RenderReadPixels;
     renderer->RenderPresent = SW_RenderPresent;
diff --git a/src/render/software/SDL_triangle.c b/src/render/software/SDL_triangle.c
index ad1812da2..da8aa03ec 100644
--- a/src/render/software/SDL_triangle.c
+++ b/src/render/software/SDL_triangle.c
@@ -20,7 +20,7 @@
 */
 #include "../../SDL_internal.h"
 
-#if SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED && SDL_HAVE_RENDER_GEOMETRY
+#if SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED
 
 #include "SDL_surface.h"
 #include "SDL_triangle.h"