mirrors/SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL_render.c: internally change viewport/cliprect type from SDL_FRect to SDL_DRect (double precision). (see bug #5547)

Browse Source
This commit is contained in:
Sylvain 2022-04-18 21:09:48 +02:00 committed by Sam Lantinga
parent 9919d1a7a5
commit 1ede941f5c
2 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/render/SDL_render.c
View File

@ -356,7 +356,7 @@ QueueCmdSetViewport(SDL_Renderer *renderer)
if (cmd != NULL) { if (cmd != NULL) {
cmd->command = SDL_RENDERCMD_SETVIEWPORT; cmd->command = SDL_RENDERCMD_SETVIEWPORT;
cmd->data.viewport.first = 0; /* render backend will fill this in. */ cmd->data.viewport.first = 0; /* render backend will fill this in. */
/* Convert SDL_FRect to SDL_Rect */ /* Convert SDL_DRect to SDL_Rect */
cmd->data.viewport.rect.x = (int)SDL_floor(renderer->viewport.x); cmd->data.viewport.rect.x = (int)SDL_floor(renderer->viewport.x);
cmd->data.viewport.rect.y = (int)SDL_floor(renderer->viewport.y); cmd->data.viewport.rect.y = (int)SDL_floor(renderer->viewport.y);
cmd->data.viewport.rect.w = (int)SDL_floor(renderer->viewport.w); cmd->data.viewport.rect.w = (int)SDL_floor(renderer->viewport.w);
@ -386,7 +386,7 @@ QueueCmdSetClipRect(SDL_Renderer *renderer)
} else { } else {
cmd->command = SDL_RENDERCMD_SETCLIPRECT; cmd->command = SDL_RENDERCMD_SETCLIPRECT;
cmd->data.cliprect.enabled = renderer->clipping_enabled; cmd->data.cliprect.enabled = renderer->clipping_enabled;
/* Convert SDL_FRect to SDL_Rect */ /* Convert SDL_DRect to SDL_Rect */
cmd->data.cliprect.rect.x = (int)SDL_floor(renderer->clip_rect.x); cmd->data.cliprect.rect.x = (int)SDL_floor(renderer->clip_rect.x);
cmd->data.cliprect.rect.y = (int)SDL_floor(renderer->clip_rect.y); cmd->data.cliprect.rect.y = (int)SDL_floor(renderer->clip_rect.y);
cmd->data.cliprect.rect.w = (int)SDL_floor(renderer->clip_rect.w); cmd->data.cliprect.rect.w = (int)SDL_floor(renderer->clip_rect.w);
@ -676,7 +676,7 @@ SDL_GetRenderDriverInfo(int index, SDL_RendererInfo * info)
#endif #endif
} }
static void GetWindowViewportValues(SDL_Renderer *renderer, int *logical_w, int *logical_h, SDL_FRect *viewport, SDL_FPoint *scale) static void GetWindowViewportValues(SDL_Renderer *renderer, int *logical_w, int *logical_h, SDL_DRect *viewport, SDL_FPoint *scale)
{ {
SDL_LockMutex(renderer->target_mutex); SDL_LockMutex(renderer->target_mutex);
*logical_w = renderer->target ? renderer->logical_w_backup : renderer->logical_w; *logical_w = renderer->target ? renderer->logical_w_backup : renderer->logical_w;
@ -738,10 +738,10 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
SDL_GetWindowSize(renderer->window, &w, &h); SDL_GetWindowSize(renderer->window, &w, &h);
} }
renderer->viewport.x = 0; renderer->viewport.x = (double)0;
renderer->viewport.y = 0; renderer->viewport.y = (double)0;
renderer->viewport.w = (float) w; renderer->viewport.w = (double)w;
renderer->viewport.h = (float) h; renderer->viewport.h = (double)h;
QueueCmdSetViewport(renderer); QueueCmdSetViewport(renderer);
FlushRenderCommandsIfNotBatching(renderer); FlushRenderCommandsIfNotBatching(renderer);
} }
@ -768,7 +768,7 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
SDL_Window *window = SDL_GetWindowFromID(event->motion.windowID); SDL_Window *window = SDL_GetWindowFromID(event->motion.windowID);
if (window == renderer->window) { if (window == renderer->window) {
int logical_w, logical_h; int logical_w, logical_h;
SDL_FRect viewport; SDL_DRect viewport;
SDL_FPoint scale; SDL_FPoint scale;
GetWindowViewportValues(renderer, &logical_w, &logical_h, &viewport, &scale); GetWindowViewportValues(renderer, &logical_w, &logical_h, &viewport, &scale);
if (logical_w) { if (logical_w) {
@ -795,7 +795,7 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
SDL_Window *window = SDL_GetWindowFromID(event->button.windowID); SDL_Window *window = SDL_GetWindowFromID(event->button.windowID);
if (window == renderer->window) { if (window == renderer->window) {
int logical_w, logical_h; int logical_w, logical_h;
SDL_FRect viewport; SDL_DRect viewport;
SDL_FPoint scale; SDL_FPoint scale;
GetWindowViewportValues(renderer, &logical_w, &logical_h, &viewport, &scale); GetWindowViewportValues(renderer, &logical_w, &logical_h, &viewport, &scale);
if (logical_w) { if (logical_w) {
@ -810,7 +810,7 @@ SDL_RendererEventWatch(void *userdata, SDL_Event *event)
event->type == SDL_FINGERMOTION) { event->type == SDL_FINGERMOTION) {
int logical_w, logical_h; int logical_w, logical_h;
float physical_w, physical_h; float physical_w, physical_h;
SDL_FRect viewport; SDL_DRect viewport;
SDL_FPoint scale; SDL_FPoint scale;
GetWindowViewportValues(renderer, &logical_w, &logical_h, &viewport, &scale); GetWindowViewportValues(renderer, &logical_w, &logical_h, &viewport, &scale);
@ -2228,10 +2228,10 @@ SDL_SetRenderTarget(SDL_Renderer *renderer, SDL_Texture *texture)
} }
if (texture) { if (texture) {
renderer->viewport.x = 0.0f; renderer->viewport.x = (double)0;
renderer->viewport.y = 0.0f; renderer->viewport.y = (double)0;
renderer->viewport.w = (float) texture->w; renderer->viewport.w = (double)texture->w;
renderer->viewport.h = (float) texture->h; renderer->viewport.h = (double)texture->h;
SDL_zero(renderer->clip_rect); SDL_zero(renderer->clip_rect);
renderer->clipping_enabled = SDL_FALSE; renderer->clipping_enabled = SDL_FALSE;
renderer->scale.x = 1.0f; renderer->scale.x = 1.0f;
@ -2440,19 +2440,19 @@ SDL_RenderSetViewport(SDL_Renderer * renderer, const SDL_Rect * rect)
CHECK_RENDERER_MAGIC(renderer, -1); CHECK_RENDERER_MAGIC(renderer, -1);
if (rect) { if (rect) {
renderer->viewport.x = rect->x * renderer->scale.x; renderer->viewport.x = (double)rect->x * renderer->scale.x;
renderer->viewport.y = rect->y * renderer->scale.y; renderer->viewport.y = (double)rect->y * renderer->scale.y;
renderer->viewport.w = rect->w * renderer->scale.x; renderer->viewport.w = (double)rect->w * renderer->scale.x;
renderer->viewport.h = rect->h * renderer->scale.y; renderer->viewport.h = (double)rect->h * renderer->scale.y;
} else { } else {
int w, h; int w, h;
if (SDL_GetRendererOutputSize(renderer, &w, &h) < 0) { if (SDL_GetRendererOutputSize(renderer, &w, &h) < 0) {
return -1; return -1;
} }
renderer->viewport.x = 0.0f; renderer->viewport.x = (double)0;
renderer->viewport.y = 0.0f; renderer->viewport.y = (double)0;
renderer->viewport.w = (float) w; renderer->viewport.w = (double)w;
renderer->viewport.h = (float) h; renderer->viewport.h = (double)h;
} }
retval = QueueCmdSetViewport(renderer); retval = QueueCmdSetViewport(renderer);
return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer); return retval < 0 ? retval : FlushRenderCommandsIfNotBatching(renderer);
@ -2488,10 +2488,10 @@ SDL_RenderSetClipRect(SDL_Renderer * renderer, const SDL_Rect * rect)
if (rect) { if (rect) {
renderer->clipping_enabled = SDL_TRUE; renderer->clipping_enabled = SDL_TRUE;
renderer->clip_rect.x = rect->x * renderer->scale.x; renderer->clip_rect.x = (double)rect->x * renderer->scale.x;
renderer->clip_rect.y = rect->y * renderer->scale.y; renderer->clip_rect.y = (double)rect->y * renderer->scale.y;
renderer->clip_rect.w = rect->w * renderer->scale.x; renderer->clip_rect.w = (double)rect->w * renderer->scale.x;
renderer->clip_rect.h = rect->h * renderer->scale.y; renderer->clip_rect.h = (double)rect->h * renderer->scale.y;
} else { } else {
renderer->clipping_enabled = SDL_FALSE; renderer->clipping_enabled = SDL_FALSE;
SDL_zero(renderer->clip_rect); SDL_zero(renderer->clip_rect);

25
src/render/SDL_sysrender.h
View File

@ -28,6 +28,19 @@
#include "SDL_mutex.h" #include "SDL_mutex.h"
#include "SDL_yuv_sw_c.h" #include "SDL_yuv_sw_c.h"
/**
* A rectangle, with the origin at the upper left (double precision).
*/
typedef struct SDL_DRect
{
double x;
double y;
double w;
double h;
} SDL_DRect;
/* The SDL 2D rendering system */ /* The SDL 2D rendering system */
typedef struct SDL_RenderDriver SDL_RenderDriver; typedef struct SDL_RenderDriver SDL_RenderDriver;
@ -201,12 +214,12 @@ struct SDL_Renderer
SDL_bool integer_scale; SDL_bool integer_scale;
/* The drawable area within the window */ /* The drawable area within the window */
SDL_FRect viewport; SDL_DRect viewport;
SDL_FRect viewport_backup; SDL_DRect viewport_backup;
/* The clip rectangle within the window */ /* The clip rectangle within the window */
SDL_FRect clip_rect; SDL_DRect clip_rect;
SDL_FRect clip_rect_backup; SDL_DRect clip_rect_backup;
/* Wether or not the clipping rectangle is used. */ /* Wether or not the clipping rectangle is used. */
SDL_bool clipping_enabled; SDL_bool clipping_enabled;
@ -244,8 +257,8 @@ struct SDL_Renderer
SDL_RenderCommand *render_commands_pool; SDL_RenderCommand *render_commands_pool;
Uint32 render_command_generation; Uint32 render_command_generation;
Uint32 last_queued_color; Uint32 last_queued_color;
SDL_FRect last_queued_viewport; SDL_DRect last_queued_viewport;
SDL_FRect last_queued_cliprect; SDL_DRect last_queued_cliprect;
SDL_bool last_queued_cliprect_enabled; SDL_bool last_queued_cliprect_enabled;
SDL_bool color_queued; SDL_bool color_queued;
SDL_bool viewport_queued; SDL_bool viewport_queued;