0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #456 from aginor/sdl2

Browse source 
Fix the graphics corruption when scrolling with SDL2 enabled
This commit is contained in:
lipk 2015-08-15 19:56:29 +02:00
commit 2d0482be91
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/display.cpp
View file

@ -2226,6 +2226,13 @@ bool display::scroll(int xmove, int ymove, bool force)
srcrect.y -= dy; srcrect.y -= dy;
if (!screen_.update_locked()) { if (!screen_.update_locked()) {
/* TODO: This is a workaround for a SDL2 bug when blitting on overlapping surfaces.
* The bug only strikes during scrolling, but will then duplicate textures across
* the entire map. */
#if SDL_VERSION_ATLEAST(2,0,0)
surface screen_copy = make_neutral_surface(screen);
SDL_BlitSurface(screen_copy,&srcrect,screen,&dstrect);
#else
// Hack to workaround bug #17573 // Hack to workaround bug #17573
#if defined(__GLIBC__) #if defined(__GLIBC__)
if (do_reverse_memcpy_workaround_) { if (do_reverse_memcpy_workaround_) {
@ -2236,6 +2243,7 @@ bool display::scroll(int xmove, int ymove, bool force)
} }
#else #else
SDL_BlitSurface(screen,&srcrect,screen,&dstrect); SDL_BlitSurface(screen,&srcrect,screen,&dstrect);
#endif
#endif #endif
} }