fix stub system driver and some warnings

[d2df-sdl.git] / src / game / g_window.pas

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index f623e8a69eca02f4924c5717b5a70a4569919679..3ea192bd998ede79b04215dec5bb09251afb2ab4 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -38,6 +38,7 @@ uses
 {$IFDEF ENABLE_HOLMES}
   g_holmes, sdlcarcass, fui_ctls,
 {$ENDIF}
+{$INCLUDE ../nogl/noGLuses.inc}
   SysUtils, Classes, MAPDEF, Math,
   e_graphics, e_log, e_texture, g_main,
   g_console, e_input, g_options, g_game,
@@ -54,8 +55,6 @@ var
   flag: Boolean;
   wNeedTimeReset: Boolean = false;
   wMinimized: Boolean = false;
-  wMaximized: Boolean = false;
-  wLoadingProgress: Boolean = false;
   wLoadingQuit: Boolean = false;
 
 procedure ResetTimer ();
@@ -69,27 +68,13 @@ var
 {$ENDIF}
 
 procedure ProcessLoading (forceUpdate: Boolean=false);
-var
 {$IFNDEF HEADLESS}
-//  ev: TSDL_Event;
+var
   stt: UInt64;
 {$ENDIF}
 begin
-//  FillChar(ev, sizeof(ev), 0);
-  wLoadingProgress := true;
-
-//  while (SDL_PollEvent(@ev) > 0) do
-//  begin
-//    EventHandler(ev);
-//    if (ev.type_ = SDL_QUITEV) then break;
-//  end;
-  //e_PollJoysticks();
-
-//  if (ev.type_ = SDL_QUITEV) or (gExit = EXIT_QUIT) then
-//  begin
-//    wLoadingProgress := false;
-//    exit;
-//  end;
+  if sys_HandleInput() = True then
+    Exit;
 
 {$IFNDEF HEADLESS}
   if not wMinimized then
@@ -123,8 +108,6 @@ begin
   begin
     if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading();
   end;
-
-  wLoadingProgress := false;
 end;
 
 
@@ -200,12 +183,51 @@ begin
   e_SoundUpdate();
 end;
 
+function GLExtensionList (): SSArray;
+  var s: PChar; i, j, num: GLint;
+begin
+  result := nil;
+  s := glGetString(GL_EXTENSIONS);
+  if s <> nil then
+  begin
+    num := 0; i := 0; j := 0;
+    while s[i] <> #0 do
+    begin
+      while (s[i] <> #0) and (s[i] <> ' ') do Inc(i);
+      SetLength(result, num + 1);
+      result[num] := Copy(s, j, i - j);
+      while (s[i] <> #0) and (s[i] = ' ') do Inc(i);
+      j := i;
+      Inc(num)
+    end
+  end
+end;
+
+function GLExtensionSupported (ext: AnsiString): Boolean;
+  var i, len: GLint; exts: SSArray;
+begin
+  result := false;
+  exts := GLExtensionList();
+  if exts <> nil then
+  begin
+    i := 0; len := Length(exts);
+    while (i < len) and (exts[i] <> ext) do Inc(i);
+    result := i < len
+  end
+end;
+
+procedure PrintGLSupportedExtensions;
+begin
+  e_LogWritefln('GL Vendor: %s', [glGetString(GL_VENDOR)]);
+  e_LogWritefln('GL Renderer: %s', [glGetString(GL_RENDERER)]);
+  e_LogWritefln('GL Version: %s', [glGetString(GL_VERSION)]);
+  e_LogWritefln('GL Shaders: %s', [glGetString(GL_SHADING_LANGUAGE_VERSION)]);
+  e_LogWritefln('GL Extensions: %s', [glGetString(GL_EXTENSIONS)]);
+end;
+
 function SDLMain (): Integer;
 var
   idx: Integer;
-  {$IF not DEFINED(HEADLESS)}
-  ltmp: Integer;
-  {$ENDIF}
   arg: AnsiString;
   mdfo: TStream;
   {$IFDEF ENABLE_HOLMES}
@@ -215,14 +237,6 @@ var
 begin
 {$IFDEF HEADLESS}
   e_NoGraphics := true;
-{$ELSE}
-  {$IFDEF ENABLE_HOLMES}
-    if (not g_holmes_imfunctional) then
-    begin
-      uiInitialize();
-      uiContext.font := 'win14';
-    end;
-  {$ENDIF}
 {$ENDIF}
 
   idx := 1;
@@ -308,6 +322,15 @@ begin
     end;
   end;
 
+{$IFDEF USE_SYSSTUB}
+  PrintGLSupportedExtensions;
+  glLegacyNPOT := GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot');
+{$ELSE}
+  glLegacyNPOT := False;
+{$ENDIF}
+  e_logWritefln('NPOT textures: %s', [glLegacyNPOT]);
+  gwin_dump_extensions := false;
+
   Init;
   Time_Old := sys_GetTicks();