X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl%2Fg_system.pas;h=0067bbca54da5798197c71d9c6a709906e9f2090;hb=c8d05082e92b7c2c5b722e2b205e96a15a32eec2;hp=bb8c66ae3e28a1a1ffa8a68d642da52ac0ad4f6c;hpb=e4186a2f4f35eec5321707bdc4eb2cbc94edccd0;p=d2df-sdl.git diff --git a/src/game/sdl/g_system.pas b/src/game/sdl/g_system.pas index bb8c66a..0067bbc 100644 --- a/src/game/sdl/g_system.pas +++ b/src/game/sdl/g_system.pas @@ -19,10 +19,6 @@ interface uses Utils; - (* --- Utils --- *) - function sys_GetTicks (): Int64; - procedure sys_Delay (ms: Integer); - (* --- Graphics --- *) function sys_GetDisplayModes (bpp: Integer): SSArray; function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean; @@ -51,9 +47,8 @@ implementation {$ENDIF} {$ENDIF} SysUtils, SDL, Math, - {$INCLUDE ../nogl/noGLuses.inc} - e_log, r_graphics, e_input, e_sound, - g_options, g_console, g_game, g_menu, g_gui, g_basic; + e_log, e_input, e_sound, + g_options, g_console, g_game, g_basic; const GameTitle = 'Doom 2D: Forever (SDL 1.2, %s, %s)'; @@ -67,52 +62,8 @@ implementation JoystickHatState: array [0..e_MaxJoys - 1, 0..e_MaxJoyHats - 1, HAT_LEFT..HAT_DOWN] of Boolean; JoystickZeroAxes: array [0..e_MaxJoys - 1, 0..e_MaxJoyAxes - 1] of Integer; - (* --------- Utils --------- *) - - function sys_GetTicks (): Int64; - begin - result := SDL_GetTicks() - end; - - procedure sys_Delay (ms: Integer); - begin - SDL_Delay(ms) - end; - (* --------- Graphics --------- *) - function LoadGL: Boolean; - var ltmp: Integer; - begin - result := true; - {$IFDEF NOGL_INIT} - nogl_Init; - if glRenderToFBO and (not nogl_ExtensionSupported('GL_OES_framebuffer_object')) then - begin - e_LogWriteln('GL: framebuffer objects not supported; disabling FBO rendering'); - glRenderToFBO := false; - end; - {$ELSE} - if glRenderToFBO and (not Load_GL_ARB_framebuffer_object) then - begin - e_LogWriteln('GL: framebuffer objects not supported; disabling FBO rendering'); - glRenderToFBO := false; - end; - {$ENDIF} - if SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, ltmp) = 0 then - begin - e_LogWritefln('stencil buffer size: %s', [ltmp]); - gwin_has_stencil := (ltmp > 0); - end; - end; - - procedure FreeGL; - begin - {$IFDEF NOGL_INIT} - nogl_Quit(); - {$ENDIF} - end; - function GetDriver (): AnsiString; var buf: array [0..31] of AnsiChar; begin @@ -150,11 +101,6 @@ implementation screen := SDL_SetVideoMode(w, h, bpp, flags); if screen <> nil then begin - if not LoadGL then - begin - e_LogWriteln('GL: unable to load OpenGL functions', TMsgType.Fatal); - exit; - end; title := GetTitle(); SDL_WM_SetCaption(PChar(title), nil); gFullScreen := fullscreen; @@ -689,10 +635,7 @@ implementation for i := 0 to e_MaxJoys - 1 do RemoveJoystick(i); if screen <> nil then - begin - FreeGL; - SDL_FreeSurface(screen) - end; + SDL_FreeSurface(screen); SDL_Quit end;