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

SDL_Update{YUV,NV}Texture: also intersect rect with texture dimension

This commit is contained in:
Sylvain Becker 2021-01-27 10:54:49 +01:00
parent 13626c3681
commit 70b353d1a5
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/render/SDL_render.c
View File

@ -1692,7 +1692,7 @@ int SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect,
{ {
#if SDL_HAVE_YUV #if SDL_HAVE_YUV
SDL_Renderer *renderer; SDL_Renderer *renderer;
SDL_Rect full_rect; SDL_Rect real_rect;
CHECK_TEXTURE_MAGIC(texture, -1); CHECK_TEXTURE_MAGIC(texture, -1);
@ -1720,20 +1720,20 @@ int SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect,
return SDL_SetError("Texture format must by YV12 or IYUV"); return SDL_SetError("Texture format must by YV12 or IYUV");
} }
if (!rect) { real_rect.x = 0;
full_rect.x = 0; real_rect.y = 0;
full_rect.y = 0; real_rect.w = texture->w;
full_rect.w = texture->w; real_rect.h = texture->h;
full_rect.h = texture->h; if (rect) {
rect = &full_rect; SDL_IntersectRect(rect, &real_rect, &real_rect);
} }
if (!rect->w || !rect->h) { if (real_rect.w == 0 || real_rect.h == 0) {
return 0; /* nothing to do. */ return 0; /* nothing to do. */
} }
if (texture->yuv) { if (texture->yuv) {
return SDL_UpdateTextureYUVPlanar(texture, rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch); return SDL_UpdateTextureYUVPlanar(texture, &real_rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch);
} else { } else {
SDL_assert(!texture->native); SDL_assert(!texture->native);
renderer = texture->renderer; renderer = texture->renderer;
@ -1742,7 +1742,7 @@ int SDL_UpdateYUVTexture(SDL_Texture * texture, const SDL_Rect * rect,
if (FlushRenderCommandsIfTextureNeeded(texture) < 0) { if (FlushRenderCommandsIfTextureNeeded(texture) < 0) {
return -1; return -1;
} }
return renderer->UpdateTextureYUV(renderer, texture, rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch); return renderer->UpdateTextureYUV(renderer, texture, &real_rect, Yplane, Ypitch, Uplane, Upitch, Vplane, Vpitch);
} else { } else {
return SDL_Unsupported(); return SDL_Unsupported();
} }
@ -1758,7 +1758,7 @@ int SDL_UpdateNVTexture(SDL_Texture * texture, const SDL_Rect * rect,
{ {
#if SDL_HAVE_YUV #if SDL_HAVE_YUV
SDL_Renderer *renderer; SDL_Renderer *renderer;
SDL_Rect full_rect; SDL_Rect real_rect;
CHECK_TEXTURE_MAGIC(texture, -1); CHECK_TEXTURE_MAGIC(texture, -1);
@ -1780,20 +1780,20 @@ int SDL_UpdateNVTexture(SDL_Texture * texture, const SDL_Rect * rect,
return SDL_SetError("Texture format must by NV12 or NV21"); return SDL_SetError("Texture format must by NV12 or NV21");
} }
if (!rect) { real_rect.x = 0;
full_rect.x = 0; real_rect.y = 0;
full_rect.y = 0; real_rect.w = texture->w;
full_rect.w = texture->w; real_rect.h = texture->h;
full_rect.h = texture->h; if (rect) {
rect = &full_rect; SDL_IntersectRect(rect, &real_rect, &real_rect);
} }
if (!rect->w || !rect->h) { if (real_rect.w == 0 || real_rect.h == 0) {
return 0; /* nothing to do. */ return 0; /* nothing to do. */
} }
if (texture->yuv) { if (texture->yuv) {
return SDL_UpdateTextureNVPlanar(texture, rect, Yplane, Ypitch, UVplane, UVpitch); return SDL_UpdateTextureNVPlanar(texture, &real_rect, Yplane, Ypitch, UVplane, UVpitch);
} else { } else {
SDL_assert(!texture->native); SDL_assert(!texture->native);
renderer = texture->renderer; renderer = texture->renderer;
@ -1802,7 +1802,7 @@ int SDL_UpdateNVTexture(SDL_Texture * texture, const SDL_Rect * rect,
if (FlushRenderCommandsIfTextureNeeded(texture) < 0) { if (FlushRenderCommandsIfTextureNeeded(texture) < 0) {
return -1; return -1;
} }
return renderer->UpdateTextureNV(renderer, texture, rect, Yplane, Ypitch, UVplane, UVpitch); return renderer->UpdateTextureNV(renderer, texture, &real_rect, Yplane, Ypitch, UVplane, UVpitch);
} else { } else {
return SDL_Unsupported(); return SDL_Unsupported();
} }