mirrors
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL_RenderGetViewportF: only need the size of viewport (see bug #5424)

This commit is contained in:
Sylvain Becker 2021-01-02 17:18:13 +01:00
parent 41597249e8
commit 2af765da11
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/render/SDL_render.c
View File

@ -2154,12 +2154,12 @@ SDL_RenderGetViewport(SDL_Renderer * renderer, SDL_Rect * rect)
} }
static void static void
SDL_RenderGetViewportF(SDL_Renderer * renderer, SDL_FRect * rect) RenderGetViewportSize(SDL_Renderer * renderer, SDL_FRect * rect)
{ {
CHECK_RENDERER_MAGIC(renderer, ); CHECK_RENDERER_MAGIC(renderer, );
if (rect) { if (rect) {
rect->x = renderer->viewport.x / renderer->scale.x; rect->x = 0.0f;
rect->y = renderer->viewport.y / renderer->scale.y; rect->y = 0.0f;
rect->w = renderer->viewport.w / renderer->scale.x; rect->w = renderer->viewport.w / renderer->scale.x;
rect->h = renderer->viewport.h / renderer->scale.y; 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' == NULL, then outline the whole surface */
if (!rect) { if (!rect) {
SDL_RenderGetViewportF(renderer, &frect); RenderGetViewportSize(renderer, &frect);
rect = &frect; rect = &frect;
} }
@ -2787,7 +2787,7 @@ SDL_RenderFillRect(SDL_Renderer * renderer, const SDL_Rect * rect)
frect.w = (float) rect->w; frect.w = (float) rect->w;
frect.h = (float) rect->h; frect.h = (float) rect->h;
} else { } else {
SDL_RenderGetViewportF(renderer, &frect); RenderGetViewportSize(renderer, &frect);
} }
return SDL_RenderFillRectsF(renderer, &frect, 1); 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' == NULL, then outline the whole surface */
if (!rect) { if (!rect) {
SDL_RenderGetViewportF(renderer, &frect); RenderGetViewportSize(renderer, &frect);
rect = &frect; rect = &frect;
} }
return SDL_RenderFillRectsF(renderer, rect, 1); 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 (dstrect) {
if (!SDL_HasIntersectionF(dstrect, &real_dstrect)) { if (!SDL_HasIntersectionF(dstrect, &real_dstrect)) {
return 0; return 0;
@ -3082,7 +3082,7 @@ SDL_RenderCopyExF(SDL_Renderer * renderer, SDL_Texture * texture,
if (dstrect) { if (dstrect) {
real_dstrect = *dstrect; real_dstrect = *dstrect;
} else { } else {
SDL_RenderGetViewportF(renderer, &real_dstrect); RenderGetViewportSize(renderer, &real_dstrect);
} }
if (texture->native) { if (texture->native) {