Commit 6dafc8501752c96fb0ff6c5a0ba913f2e63c2ef5
2021-12-07T10:44:12
SDL_DrawLines: minor simpification: - scale is 1.0f, don't need to multiply - typo in error message - remap SDL_DrawLines to SDL_DrawLinesF
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
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index 7879392..eafdf10 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -2940,31 +2940,29 @@ SDL_RenderDrawLines(SDL_Renderer * renderer,
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;
+ fpoints[i].x = points[i].x;
+ fpoints[i].y = points[i].y;
}
- retval = QueueCmdDrawLines(renderer, fpoints, count);
+ retval = SDL_RenderDrawLinesF(renderer, fpoints, count);
SDL_small_free(fpoints, isstack);
- return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
+ return retval;
}
int
SDL_RenderDrawLinesF(SDL_Renderer * renderer,
const SDL_FPoint * points, int count)
{
- SDL_FPoint *fpoints;
- int i;
int retval;
- SDL_bool isstack;
CHECK_RENDERER_MAGIC(renderer, -1);
if (!points) {
- return SDL_SetError("SDL_RenderDrawLines(): Passed NULL points");
+ return SDL_SetError("SDL_RenderDrawLinesF(): Passed NULL points");
}
if (count < 2) {
return 0;
@@ -2981,18 +2979,7 @@ SDL_RenderDrawLinesF(SDL_Renderer * renderer,
return RenderDrawLinesWithRectsF(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 = QueueCmdDrawLines(renderer, fpoints, count);
-
- SDL_small_free(fpoints, isstack);
+ retval = QueueCmdDrawLines(renderer, points, count);
return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
}