Commit 2026a78dc20e8cc6bb585dfcd02ef1fa46b98280
2022-01-08T09:23:58
Don't flush in RenderDraw*WithRects() This allows these functions to be reused in the future for other primitives
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 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index b75a034..985de5e 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -2654,7 +2654,7 @@ RenderDrawPointsWithRects(SDL_Renderer * renderer,
SDL_small_free(frects, isstack);
- return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
+ return retval;
}
int
@@ -2683,22 +2683,21 @@ SDL_RenderDrawPoints(SDL_Renderer * renderer,
#endif
if (renderer->scale.x != 1.0f || renderer->scale.y != 1.0f) {
- return RenderDrawPointsWithRects(renderer, points, count);
- }
-
- fpoints = SDL_small_alloc(SDL_FPoint, count, &isstack);
- if (!fpoints) {
- return SDL_OutOfMemory();
- }
- for (i = 0; i < count; ++i) {
- fpoints[i].x = points[i].x * renderer->scale.x;
- fpoints[i].y = points[i].y * renderer->scale.y;
- }
-
- retval = QueueCmdDrawPoints(renderer, fpoints, count);
+ retval = RenderDrawPointsWithRects(renderer, points, count);
+ } else {
+ fpoints = SDL_small_alloc(SDL_FPoint, count, &isstack);
+ if (!fpoints) {
+ return SDL_OutOfMemory();
+ }
+ for (i = 0; i < count; ++i) {
+ fpoints[i].x = points[i].x * renderer->scale.x;
+ fpoints[i].y = points[i].y * renderer->scale.y;
+ }
- SDL_small_free(fpoints, isstack);
+ retval = QueueCmdDrawPoints(renderer, fpoints, count);
+ SDL_small_free(fpoints, isstack);
+ }
return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
}
@@ -2728,7 +2727,7 @@ RenderDrawPointsWithRectsF(SDL_Renderer * renderer,
SDL_small_free(frects, isstack);
- return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
+ return retval;
}
int
@@ -2757,22 +2756,21 @@ SDL_RenderDrawPointsF(SDL_Renderer * renderer,
#endif
if (renderer->scale.x != 1.0f || renderer->scale.y != 1.0f) {
- return RenderDrawPointsWithRectsF(renderer, points, count);
- }
-
- fpoints = SDL_small_alloc(SDL_FPoint, count, &isstack);
- if (!fpoints) {
- return SDL_OutOfMemory();
- }
- for (i = 0; i < count; ++i) {
- fpoints[i].x = points[i].x * renderer->scale.x;
- fpoints[i].y = points[i].y * renderer->scale.y;
- }
-
- retval = QueueCmdDrawPoints(renderer, fpoints, count);
+ retval = RenderDrawPointsWithRectsF(renderer, points, count);
+ } else {
+ fpoints = SDL_small_alloc(SDL_FPoint, count, &isstack);
+ if (!fpoints) {
+ return SDL_OutOfMemory();
+ }
+ for (i = 0; i < count; ++i) {
+ fpoints[i].x = points[i].x * renderer->scale.x;
+ fpoints[i].y = points[i].y * renderer->scale.y;
+ }
- SDL_small_free(fpoints, isstack);
+ retval = QueueCmdDrawPoints(renderer, fpoints, count);
+ SDL_small_free(fpoints, isstack);
+ }
return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
}
@@ -2799,63 +2797,6 @@ SDL_RenderDrawLineF(SDL_Renderer * renderer, float x1, float y1, float x2, float
}
static int
-RenderDrawLinesWithRects(SDL_Renderer * renderer,
- const SDL_Point * points, const int count)
-{
- SDL_FRect *frect;
- SDL_FRect *frects;
- SDL_FPoint fpoints[2];
- int i, nrects = 0;
- int retval = 0;
- SDL_bool isstack;
-
- frects = SDL_small_alloc(SDL_FRect, count-1, &isstack);
- if (!frects) {
- return SDL_OutOfMemory();
- }
-
- for (i = 0; i < count-1; ++i) {
- if (points[i].x == points[i+1].x) {
- const int minY = SDL_min(points[i].y, points[i+1].y);
- const int maxY = SDL_max(points[i].y, points[i+1].y);
-
- frect = &frects[nrects++];
- frect->x = points[i].x * renderer->scale.x;
- frect->y = minY * renderer->scale.y;
- frect->w = renderer->scale.x;
- frect->h = (maxY - minY + 1) * renderer->scale.y;
- } else if (points[i].y == points[i+1].y) {
- const int minX = SDL_min(points[i].x, points[i+1].x);
- const int maxX = SDL_max(points[i].x, points[i+1].x);
-
- frect = &frects[nrects++];
- frect->x = minX * renderer->scale.x;
- frect->y = points[i].y * renderer->scale.y;
- frect->w = (maxX - minX + 1) * renderer->scale.x;
- frect->h = renderer->scale.y;
- } else {
- /* FIXME: We can't use a rect for this line... */
- fpoints[0].x = points[i].x * renderer->scale.x;
- fpoints[0].y = points[i].y * renderer->scale.y;
- fpoints[1].x = points[i+1].x * renderer->scale.x;
- fpoints[1].y = points[i+1].y * renderer->scale.y;
- retval += QueueCmdDrawLines(renderer, fpoints, 2);
- }
- }
-
- if (nrects) {
- retval += QueueCmdFillRects(renderer, frects, nrects);
- }
-
- SDL_small_free(frects, isstack);
-
- if (retval < 0) {
- retval = -1;
- }
- return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
-}
-
-static int
RenderDrawLinesWithRectsF(SDL_Renderer * renderer,
const SDL_FPoint * points, const int count)
{
@@ -2873,8 +2814,8 @@ RenderDrawLinesWithRectsF(SDL_Renderer * renderer,
for (i = 0; i < count-1; ++i) {
if (points[i].x == points[i+1].x) {
- const int minY = (int)SDL_min(points[i].y, points[i+1].y);
- const int maxY = (int)SDL_max(points[i].y, points[i+1].y);
+ const float minY = SDL_min(points[i].y, points[i+1].y);
+ const float maxY = SDL_max(points[i].y, points[i+1].y);
frect = &frects[nrects++];
frect->x = points[i].x * renderer->scale.x;
@@ -2882,8 +2823,8 @@ RenderDrawLinesWithRectsF(SDL_Renderer * renderer,
frect->w = renderer->scale.x;
frect->h = (maxY - minY + 1) * renderer->scale.y;
} else if (points[i].y == points[i+1].y) {
- const int minX = (int)SDL_min(points[i].x, points[i+1].x);
- const int maxX = (int)SDL_max(points[i].x, points[i+1].x);
+ const float minX = SDL_min(points[i].x, points[i+1].x);
+ const float maxX = SDL_max(points[i].x, points[i+1].x);
frect = &frects[nrects++];
frect->x = minX * renderer->scale.x;
@@ -2909,7 +2850,7 @@ RenderDrawLinesWithRectsF(SDL_Renderer * renderer,
if (retval < 0) {
retval = -1;
}
- return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
+ return retval;
}
int
@@ -2937,10 +2878,6 @@ SDL_RenderDrawLines(SDL_Renderer * renderer,
}
#endif
- if (renderer->scale.x != 1.0f || renderer->scale.y != 1.0f) {
- return RenderDrawLinesWithRects(renderer, points, count);
- }
-
fpoints = SDL_small_alloc(SDL_FPoint, count, &isstack);
if (!fpoints) {
return SDL_OutOfMemory();
@@ -2981,13 +2918,11 @@ SDL_RenderDrawLinesF(SDL_Renderer * renderer,
}
#endif
- if (renderer->scale.x != 1.0f || renderer->scale.y != 1.0f) {
- return RenderDrawLinesWithRectsF(renderer, points, count);
- }
-
use_rendergeometry = (renderer->QueueDrawLines == NULL);
- if (use_rendergeometry) {
+ if (renderer->scale.x != 1.0f || renderer->scale.y != 1.0f) {
+ retval = RenderDrawLinesWithRectsF(renderer, points, count);
+ } else if (use_rendergeometry) {
SDL_bool isstack1;
SDL_bool isstack2;
float *xy = SDL_small_alloc(float, 4 * 2 * count, &isstack1);