lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2

This commit is contained in:
Alam Ed Arias 2014-07-25 20:00:46 -04:00
parent d438a8f8c2 b429cce3b6
commit 424d6531c9
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sdl2/i_video.c
View File

@ -133,6 +133,7 @@ static SDL_bool mousegrabok = SDL_TRUE;
static SDL_bool videoblitok = SDL_FALSE; static SDL_bool videoblitok = SDL_FALSE;
static SDL_bool exposevideo = SDL_FALSE; static SDL_bool exposevideo = SDL_FALSE;
static SDL_bool usesdl2soft = SDL_FALSE; static SDL_bool usesdl2soft = SDL_FALSE;
static SDL_bool borderlesswindow = SDL_FALSE;
// SDL2 vars // SDL2 vars
SDL_Window *window; SDL_Window *window;
@ -246,6 +247,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
} }
else else
{ {
bpp = 32;
sw_texture_format = SDL_PIXELFORMAT_RGBA8888; sw_texture_format = SDL_PIXELFORMAT_RGBA8888;
} }
@ -1386,6 +1388,7 @@ void I_FinishUpdate(void)
SDL_UpdateTexture(texture, &rect, vidSurface->pixels, vidSurface->pitch); SDL_UpdateTexture(texture, &rect, vidSurface->pixels, vidSurface->pitch);
SDL_UnlockSurface(vidSurface); SDL_UnlockSurface(vidSurface);
} }
SDL_RenderClear(renderer);
SDL_RenderCopy(renderer, texture, NULL, NULL); SDL_RenderCopy(renderer, texture, NULL, NULL);
SDL_RenderPresent(renderer); SDL_RenderPresent(renderer);
} }
@ -1659,7 +1662,12 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
if (fullscreen) if (fullscreen)
{ {
flags = SDL_WINDOW_FULLSCREEN_DESKTOP; flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
}
if (borderlesswindow)
{
flags |= SDL_WINDOW_BORDERLESS;
} }
#ifdef HWRENDER #ifdef HWRENDER
@ -1818,10 +1826,10 @@ void I_StartupGraphics(void)
{ {
rendermode = render_soft; rendermode = render_soft;
} }
if (M_CheckParm("-softblit"))
{ usesdl2soft = M_CheckParm("-softblit");
usesdl2soft = SDL_TRUE; borderlesswindow = M_CheckParm("-borderless");
}
//SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY>>1,SDL_DEFAULT_REPEAT_INTERVAL<<2); //SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY>>1,SDL_DEFAULT_REPEAT_INTERVAL<<2);
SDLESSet(); SDLESSet();
VID_Command_ModeList_f(); VID_Command_ModeList_f();