sdl2: code cleanup
Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2