X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fsdl%2Fg_system.pas;h=6d7cf03ef433b371fb4abcad6cf440f1c9b8cbd5;hb=cf4041fda8857d538748aee9ddb3a13cad6157ab;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..6d7cf03 100644
--- a/src/game/sdl/g_system.pas
+++ b/src/game/sdl/g_system.pas
@@ -19,20 +19,36 @@ interface
 
   uses Utils;
 
-  (* --- Utils --- *)
-  function sys_GetTicks (): Int64;
-  procedure sys_Delay (ms: Integer);
+  type
+    TGLProfile = (Core, Compat, Common, CommonLite);
+
+    TGLDisplayInfo = record
+      w, h, bpp: Integer;
+      fullscreen: Boolean;
+      maximized: Boolean;
+      major, minor: Integer;
+      profile: TGLProfile;
+    end;
 
   (* --- Graphics --- *)
+
   function sys_GetDisplayModes (bpp: Integer): SSArray;
   function sys_SetDisplayMode (w, h, bpp: Integer; fullscreen, maximized: Boolean): Boolean;
   procedure sys_EnableVSync (yes: Boolean);
   procedure sys_Repaint;
 
+  function sys_SetDisplayModeGL (const info: TGLDisplayInfo): Boolean;
+
   (* --- Input --- *)
+
   function sys_HandleInput (): Boolean;
   procedure sys_RequestQuit;
 
+{$IFDEF ENABLE_TOUCH}
+  function sys_IsTextInputActive (): Boolean;
+  procedure sys_ShowKeyboard (yes: Boolean);
+{$ENDIF}
+
   (* --- Init --- *)
   procedure sys_Init;
   procedure sys_Final;
@@ -51,9 +67,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 +82,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 +121,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;
@@ -204,6 +170,14 @@ implementation
     result := InitWindow(w, h, bpp, fullscreen)
   end;
 
+  function sys_SetDisplayModeGL (const info: TGLDisplayInfo): Boolean;
+  begin
+    result := false;
+    case info.profile of
+      TGLProfile.Compat: result := InitWindow(info.w, info.h, info.bpp, info.fullscreen);
+    end;
+  end;
+
   (* --------- Joystick --------- *)
 
   procedure HandleJoyButton (var ev: TSDL_JoyButtonEvent);
@@ -502,6 +476,18 @@ implementation
   end;
 {$ENDIF}
 
+{$IFDEF ENABLE_TOUCH}
+  procedure sys_ShowKeyboard (yes: Boolean);
+  begin
+    // stub
+  end;
+
+  function sys_IsTextInputActive (): Boolean;
+  begin
+    Result := false
+  end;
+{$ENDIF}
+
   function Key2Stub (key: Integer): Integer;
     var x: Integer;
   begin
@@ -689,10 +675,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;