Commit 2af765da110e94f5b0d290ff146c9f60442d4755
2021-01-02T17:18:13
SDL_RenderGetViewportF: only need the size of viewport (see bug #5424)
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
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index 1335150..9457ceb 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -2154,12 +2154,12 @@ SDL_RenderGetViewport(SDL_Renderer * renderer, SDL_Rect * rect)
}
static void
-SDL_RenderGetViewportF(SDL_Renderer * renderer, SDL_FRect * rect)
+RenderGetViewportSize(SDL_Renderer * renderer, SDL_FRect * rect)
{
CHECK_RENDERER_MAGIC(renderer, );
if (rect) {
- rect->x = renderer->viewport.x / renderer->scale.x;
- rect->y = renderer->viewport.y / renderer->scale.y;
+ rect->x = 0.0f;
+ rect->y = 0.0f;
rect->w = renderer->viewport.w / renderer->scale.x;
rect->h = renderer->viewport.h / renderer->scale.y;
}
@@ -2700,7 +2700,7 @@ SDL_RenderDrawRectF(SDL_Renderer * renderer, const SDL_FRect * rect)
/* If 'rect' == NULL, then outline the whole surface */
if (!rect) {
- SDL_RenderGetViewportF(renderer, &frect);
+ RenderGetViewportSize(renderer, &frect);
rect = &frect;
}
@@ -2787,7 +2787,7 @@ SDL_RenderFillRect(SDL_Renderer * renderer, const SDL_Rect * rect)
frect.w = (float) rect->w;
frect.h = (float) rect->h;
} else {
- SDL_RenderGetViewportF(renderer, &frect);
+ RenderGetViewportSize(renderer, &frect);
}
return SDL_RenderFillRectsF(renderer, &frect, 1);
}
@@ -2801,7 +2801,7 @@ SDL_RenderFillRectF(SDL_Renderer * renderer, const SDL_FRect * rect)
/* If 'rect' == NULL, then outline the whole surface */
if (!rect) {
- SDL_RenderGetViewportF(renderer, &frect);
+ RenderGetViewportSize(renderer, &frect);
rect = &frect;
}
return SDL_RenderFillRectsF(renderer, rect, 1);
@@ -2989,7 +2989,7 @@ SDL_RenderCopyF(SDL_Renderer * renderer, SDL_Texture * texture,
}
}
- SDL_RenderGetViewportF(renderer, &real_dstrect);
+ RenderGetViewportSize(renderer, &real_dstrect);
if (dstrect) {
if (!SDL_HasIntersectionF(dstrect, &real_dstrect)) {
return 0;
@@ -3082,7 +3082,7 @@ SDL_RenderCopyExF(SDL_Renderer * renderer, SDL_Texture * texture,
if (dstrect) {
real_dstrect = *dstrect;
} else {
- SDL_RenderGetViewportF(renderer, &real_dstrect);
+ RenderGetViewportSize(renderer, &real_dstrect);
}
if (texture->native) {