1
0
mirror of https://github.com/joel16/SDL2.git synced 2025-03-02 16:45:46 +00:00

Fixed crash in testsprite when using the -fast option (nobody caught this?)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40108
This commit is contained in:
Sam Lantinga 2001-07-13 10:20:43 +00:00
parent a079e29715
commit 34da4efe0d

@ -92,7 +92,7 @@ void MoveSprites(SDL_Surface *screen, Uint32 background)
}
/* This is a way of telling whether or not to use hardware surfaces */
Uint32 FastestFlags(Uint32 flags)
Uint32 FastestFlags(Uint32 flags, int width, int height, int bpp)
{
const SDL_VideoInfo *info;
@ -112,8 +112,7 @@ Uint32 FastestFlags(Uint32 flags)
/* Direct hardware blitting without double-buffering
causes really bad flickering.
*/
SDL_Surface *screen = SDL_GetVideoSurface();
if ( info->video_mem > (screen->h*screen->pitch) ) {
if ( info->video_mem*1024 > (height*width*bpp/8) ) {
flags |= SDL_DOUBLEBUF;
} else {
flags &= ~SDL_HWSURFACE;
@ -164,7 +163,7 @@ int main(int argc, char *argv[])
--argc;
} else
if ( strcmp(argv[argc], "-fast") == 0 ) {
videoflags = FastestFlags(videoflags);
videoflags = FastestFlags(videoflags, width, height, video_bpp);
} else
if ( strcmp(argv[argc], "-hw") == 0 ) {
videoflags ^= SDL_HWSURFACE;