Commit c27e1249e1671209a1deeef059dfed3e18c7c15d
2021-09-20T17:17:34
Remove SDL_HAVE_RENDER_GEOMETRY define
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
diff --git a/src/SDL_internal.h b/src/SDL_internal.h
index 6e52cd5..660c247 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 8a64005..a8ed019 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 fd1c2dc..029b387 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 ad1812d..da8aa03 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"