encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split SDL_SoftStretch in Lower and Uppler functions (Bug 5313)

This commit is contained in:
Sylvain Becker 2020-12-23 21:32:01 +01:00
parent 09fcc9ed17
commit 050ee9a410
1 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/video/SDL_stretch.c
View File

@ -28,6 +28,7 @@
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_blit.h" #include "SDL_blit.h"
#include "SDL_render.h"
/* This isn't ready for general consumption yet - it should be folded /* This isn't ready for general consumption yet - it should be folded
into the general blitting mechanism. into the general blitting mechanism.
@ -196,29 +197,28 @@ copy_row3(Uint8 * src, int src_w, Uint8 * dst, int dst_w)
} }
} }
static int SDL_SoftStretchLowerNearest(SDL_Surface *src, const SDL_Rect *srcrect, SDL_Surface *dst, const SDL_Rect *dstrect);
static int SDL_UpperSoftStretch(SDL_Surface * src, const SDL_Rect * srcrect, SDL_Surface * dst, const SDL_Rect * dstrect, SDL_ScaleMode scaleMode);
/* Perform a stretch blit between two surfaces of the same format. /* Perform a stretch blit between two surfaces of the same format.
NOTE: This function is not safe to call from multiple threads! NOTE: This function is not safe to call from multiple threads!
*/ */
int int
SDL_SoftStretch(SDL_Surface * src, const SDL_Rect * srcrect, SDL_SoftStretch(SDL_Surface *src, const SDL_Rect *srcrect,
SDL_Surface * dst, const SDL_Rect * dstrect) SDL_Surface *dst, const SDL_Rect *dstrect)
{ {
return SDL_UpperSoftStretch(src, srcrect, dst, dstrect, SDL_ScaleModeNearest);
}
static int
SDL_UpperSoftStretch(SDL_Surface * src, const SDL_Rect * srcrect,
SDL_Surface * dst, const SDL_Rect * dstrect, SDL_ScaleMode scaleMode)
{
int ret;
int src_locked; int src_locked;
int dst_locked; int dst_locked;
int pos, inc;
int dst_maxrow;
int src_row, dst_row;
Uint8 *srcp = NULL;
Uint8 *dstp;
SDL_Rect full_src; SDL_Rect full_src;
SDL_Rect full_dst; SDL_Rect full_dst;
#ifdef USE_ASM_STRETCH
SDL_bool use_asm = SDL_TRUE;
#ifdef __GNUC__
int u1, u2;
#endif
#endif /* USE_ASM_STRETCH */
const int bpp = dst->format->BytesPerPixel;
if (src->format->format != dst->format->format) { if (src->format->format != dst->format->format) {
return SDL_SetError("Only works with same format surfaces"); return SDL_SetError("Only works with same format surfaces");
@ -272,6 +272,39 @@ SDL_SoftStretch(SDL_Surface * src, const SDL_Rect * srcrect,
src_locked = 1; src_locked = 1;
} }
if (scaleMode == SDL_ScaleModeNearest) {
ret = SDL_SoftStretchLowerNearest(src, srcrect, dst, dstrect);
}
/* We need to unlock the surfaces if they're locked */
if (dst_locked) {
SDL_UnlockSurface(dst);
}
if (src_locked) {
SDL_UnlockSurface(src);
}
return ret;
}
int
SDL_SoftStretchLowerNearest(SDL_Surface *src, const SDL_Rect *srcrect,
SDL_Surface *dst, const SDL_Rect *dstrect)
{
int pos, inc;
int dst_maxrow;
int src_row, dst_row;
Uint8 *srcp = NULL;
Uint8 *dstp;
#ifdef USE_ASM_STRETCH
SDL_bool use_asm = SDL_TRUE;
#ifdef __GNUC__
int u1, u2;
#endif
#endif /* USE_ASM_STRETCH */
const int bpp = dst->format->BytesPerPixel;
/* Set up the data... */ /* Set up the data... */
pos = 0x10000; pos = 0x10000;
inc = (srcrect->h << 16) / dstrect->h; inc = (srcrect->h << 16) / dstrect->h;
@ -340,14 +373,7 @@ SDL_SoftStretch(SDL_Surface * src, const SDL_Rect * srcrect,
pos += inc; pos += inc;
} }
/* We need to unlock the surfaces if they're locked */ return 0;
if (dst_locked) {
SDL_UnlockSurface(dst);
}
if (src_locked) {
SDL_UnlockSurface(src);
}
return (0);
} }
/* vi: set ts=4 sw=4 expandtab: */ /* vi: set ts=4 sw=4 expandtab: */