diff --git a/src/android/i_video.c b/src/android/i_video.c index 23c06dfb2..f3054038e 100644 --- a/src/android/i_video.c +++ b/src/android/i_video.c @@ -42,7 +42,6 @@ INT32 VID_SetMode(INT32 modenum) vid.modenum = 0; vid.width = 320; vid.height = 240; - vid.buffer = android_surface; return 0; } diff --git a/src/screen.h b/src/screen.h index e860be6fa..ce72e168e 100644 --- a/src/screen.h +++ b/src/screen.h @@ -57,7 +57,6 @@ typedef struct viddef_s // screens[3] = fade screen start // screens[4] = fade screen end, postimage tempoarary buffer - UINT8 *buffer; // invisible screens buffer INT32 width; // PIXELS per scanline INT32 height; boolean recalc; // if true, recalc vid-based stuff diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 86615dfe2..78f38f2d3 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -198,7 +198,6 @@ static INT32 windowedModes[MAXWINMODES][2] = static INT32 custom_width = 0; static INT32 custom_height = 0; -static void Impl_VideoSetupBuffer(void); static SDL_bool Impl_CreateWindow(SDL_bool fullscreen); static void Impl_SetWindowIcon(void); @@ -1302,12 +1301,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) } texture = SDL_CreateTexture(renderer, sw_texture_format, SDL_TEXTUREACCESS_STREAMING, width, height); - - if (vid.buffer) - { - free(vid.buffer); - vid.buffer = NULL; - } } } @@ -1413,7 +1406,7 @@ void I_UpdateNoVsync(void) void I_ReadScreen(UINT8 * restrict scr, INT32 scale) { if (rendermode != render_soft) - I_Error ("I_ReadScreen: called while in non-software mode"); + I_Error("I_ReadScreen: called while in non-software mode"); else if (scale == 1) VID_BlitLinearScreen(vid.screens[0], scr, vid.width, vid.height, vid.width, vid.width); else @@ -1562,7 +1555,6 @@ INT32 VID_SetMode(INT32 modeNum) } SDLSetMode(vid.width, vid.height, USE_FULLSCREEN); - Impl_VideoSetupBuffer(); src_rect.w = vid.width; src_rect.h = vid.height; @@ -1693,24 +1685,6 @@ static void Impl_SetWindowIcon(void) SDL_SetWindowIcon(window, icoSurface); } -static void Impl_VideoSetupBuffer(void) -{ - // Set up game's software render buffer - size_t size; - - if (vid.buffer) - free(vid.buffer); - - size = vid.width*vid.height * NUMSCREENS; - - vid.buffer = calloc(size, NUMSCREENS); - - if (!vid.buffer) - { - I_Error("%s", M_GetText("Not enough memory for video buffer\n")); - } -} - static FILE * OpenRendererFile(const char * mode) { char * path = va(pandf,srb2home,"renderer.txt"); @@ -1871,7 +1845,6 @@ void I_StartupGraphics(void) if (a2c) fputs("a2c\n", file); #endif - fclose(file); } else @@ -1930,21 +1903,12 @@ void I_StartupGraphics(void) void I_ShutdownGraphics(void) { - const rendermode_t oldrendermode = rendermode; - rendermode = render_none; if (icoSurface) SDL_FreeSurface(icoSurface); icoSurface = NULL; - if (oldrendermode == render_soft) - { - if (vid.buffer) - free(vid.buffer); - vid.buffer = NULL; - } - I_OutputMsg("I_ShutdownGraphics(): "); // was graphics initialized anyway? @@ -1963,6 +1927,7 @@ void I_ShutdownGraphics(void) SDL_GL_DeleteContext(sdlglcontext); } #endif + SDL_QuitSubSystem(SDL_INIT_VIDEO); framebuffer = SDL_FALSE; }