Revert "Revert "no more delay between weapon switching: now player should release...

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

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index ab8df098b0be9534e5cec7279e0aa9533c9d0539..8336ea9b82cb39b11cd0b5b95c8e992e8cc3b0dd 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -32,6 +32,7 @@ procedure Sleep (ms: LongWord);
 function GetDisplayModes (dbpp: LongWord; var selres: LongWord): SSArray;
 function g_Window_SetDisplay (preserveGL: Boolean=false): Boolean;
 function g_Window_SetSize (w, h: Word; fullscreen: Boolean): Boolean;
 function GetDisplayModes (dbpp: LongWord; var selres: LongWord): SSArray;
 function g_Window_SetDisplay (preserveGL: Boolean=false): Boolean;
 function g_Window_SetSize (w, h: Word; fullscreen: Boolean): Boolean;

+procedure g_SetVSync (vsync: Boolean);

 
 procedure ProcessLoading (forceUpdate: Boolean=false);
 
 
 procedure ProcessLoading (forceUpdate: Boolean=false);
 


@@ -50,12 +51,16 @@ implementation
 
 uses
 {$IFDEF WINDOWS}Windows,{$ENDIF}
 
 uses
 {$IFDEF WINDOWS}Windows,{$ENDIF}

+{$INCLUDE ../nogl/noGLuses.inc}
+{$IFDEF ENABLE_HOLMES}
+  g_holmes, sdlcarcass, fui_ctls,
+{$ENDIF}

   SysUtils, Classes, MAPDEF,
   SysUtils, Classes, MAPDEF,

-  SDL2, GL, GLExt, e_graphics, e_log, e_texture, g_main,
+  SDL2, e_graphics, e_log, e_texture, g_main,

   g_console, e_input, g_options, g_game,
   g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
   g_console, e_input, g_options, g_game,
   g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,

-  g_map, g_gfx, g_monsters, g_holmes, xprofiler,
-  sdlcarcass, fui_ctls;
+  g_map, g_gfx, g_monsters, xprofiler,
+  g_touch;

 
 
 const
 
 
 const


@@ -68,9 +73,11 @@ var
   flag: Boolean;
 {$IF not DEFINED(HEADLESS)}
   wTitle: PChar = nil;
   flag: Boolean;
 {$IF not DEFINED(HEADLESS)}
   wTitle: PChar = nil;

+  wasFullscreen: Boolean = true; // so we need to recreate the window

 {$ENDIF}
   wNeedTimeReset: Boolean = false;
   wMinimized: Boolean = false;
 {$ENDIF}
   wNeedTimeReset: Boolean = false;
   wMinimized: Boolean = false;

+  wMaximized: Boolean = false;

   wLoadingProgress: Boolean = false;
   wLoadingQuit: Boolean = false;
 {$IFNDEF WINDOWS}
   wLoadingProgress: Boolean = false;
   wLoadingQuit: Boolean = false;
 {$IFNDEF WINDOWS}


@@ -81,9 +88,23 @@ var
 
 procedure KillGLWindow (preserveGL: Boolean);
 begin
 
 procedure KillGLWindow (preserveGL: Boolean);
 begin

+{$IFDEF ENABLE_HOLMES}

   if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglDeinitCB)) then oglDeinitCB(); end;
   if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglDeinitCB)) then oglDeinitCB(); end;

+{$ENDIF}

   if (h_Wnd <> nil) then SDL_DestroyWindow(h_Wnd);
   if (h_Wnd <> nil) then SDL_DestroyWindow(h_Wnd);

-  if (h_GL <> nil) and (not preserveGL) then SDL_GL_DeleteContext(h_GL);
+  if (h_GL <> nil) and (not preserveGL) then
+  begin
+
+{$IFDEF USE_NANOGL}
+    nanoGL_Destroy;
+{$ENDIF}
+
+{$IFDEF USE_NOGL}
+    nogl_Quit;
+{$ENDIF}
+
+    SDL_GL_DeleteContext(h_GL);
+  end;

   h_Wnd := nil;
   if (not preserveGL) then h_GL := nil;
 end;
   h_Wnd := nil;
   if (not preserveGL) then h_GL := nil;
 end;


@@ -103,8 +124,8 @@ begin
   e_WriteLog('Setting display mode...', TMsgType.Notify);
 
   wFlags := SDL_WINDOW_OPENGL {or SDL_WINDOW_RESIZABLE};
   e_WriteLog('Setting display mode...', TMsgType.Notify);
 
   wFlags := SDL_WINDOW_OPENGL {or SDL_WINDOW_RESIZABLE};

-  if gFullscreen then wFlags := wFlags or SDL_WINDOW_FULLSCREEN else wFlags := wFlags or SDL_WINDOW_RESIZABLE;
-  if (not gFullscreen) and gWinMaximized then wFlags := wFlags or SDL_WINDOW_MAXIMIZED;
+  if gFullscreen then wFlags := wFlags {or SDL_WINDOW_FULLSCREEN} else wFlags := wFlags or SDL_WINDOW_RESIZABLE;
+  if (not gFullscreen) and (not preserveGL) and gWinMaximized then wFlags := wFlags or SDL_WINDOW_MAXIMIZED else gWinMaximized := false;

 
   if gFullscreen then
   begin
 
   if gFullscreen then
   begin


@@ -127,30 +148,30 @@ begin
     end;
   end;
 
     end;
   end;
 

-  (*if (preserveGL) and (h_Wnd <> nil) {and (gFullscreen)} then
+  if (preserveGL) and (h_Wnd <> nil) and (not gFullscreen) and (not wasFullscreen) then

   begin
   begin

-    e_WriteLog('SDL: going fullscreen...', TMsgType.Notify);

     //SDL_SetWindowMaximumSize(h_Wnd, gScreenWidth, gScreenHeight);
     //SDL_SetWindowMaximumSize(h_Wnd, gScreenWidth, gScreenHeight);

-    SDL_SetWindowDisplayMode(h_Wnd, @cmode);
+    //SDL_SetWindowDisplayMode(h_Wnd, @cmode);
+    if (wMaximized) then SDL_RestoreWindow(h_Wnd);
+    wMaximized := false;
+    gWinMaximized := false;

     SDL_SetWindowSize(h_Wnd, gScreenWidth, gScreenHeight);
     SDL_SetWindowSize(h_Wnd, gScreenWidth, gScreenHeight);

-    if (gFullscreen) then
-    begin
-      SDL_SetWindowFullscreen(h_Wnd, SDL_WINDOW_FULLSCREEN);
-    end
-    else
-    begin
-      SDL_SetWindowFullscreen(h_Wnd, 0);
-    end;
+    //SDL_SetWindowFullscreen(h_Wnd, SDL_WINDOW_FULLSCREEN);
+    //SDL_SetWindowFullscreen(h_Wnd, 0);

   end
   end

-  else*)
+  else

   begin
     KillGLWindow(preserveGL);
     h_Wnd := SDL_CreateWindow(PChar(wTitle), gWinRealPosX, gWinRealPosY, gScreenWidth, gScreenHeight, wFlags);
   begin
     KillGLWindow(preserveGL);
     h_Wnd := SDL_CreateWindow(PChar(wTitle), gWinRealPosX, gWinRealPosY, gScreenWidth, gScreenHeight, wFlags);

+    if gFullscreen then
+      SDL_SetWindowFullscreen(h_Wnd, SDL_WINDOW_FULLSCREEN);

     if (h_Wnd = nil) then exit;
   end;
     if (h_Wnd = nil) then exit;
   end;

+  wasFullscreen := gFullscreen;

 
   SDL_GL_MakeCurrent(h_Wnd, h_GL);
   SDL_ShowCursor(SDL_DISABLE);
 
   SDL_GL_MakeCurrent(h_Wnd, h_GL);
   SDL_ShowCursor(SDL_DISABLE);

+  if (h_GL <> nil) then g_SetVSync(gVSync);

   if (gFullscreen) then
   begin
     nw := 0;
   if (gFullscreen) then
   begin
     nw := 0;


@@ -167,9 +188,12 @@ begin
       e_WriteLog('SDL: fullscreen window got invalid size: '+IntToStr(nw)+'x'+IntToStr(nh), TMsgType.Notify);
     end;
   end;
       e_WriteLog('SDL: fullscreen window got invalid size: '+IntToStr(nw)+'x'+IntToStr(nh), TMsgType.Notify);
     end;
   end;

-  fuiScrWdt := gScreenWidth;
-  fuiScrHgt := gScreenHeight;
-  if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglInitCB)) then oglInitCB(); end;
+
+  {$IFDEF ENABLE_HOLMES}
+    fuiScrWdt := gScreenWidth;
+    fuiScrHgt := gScreenHeight;
+    if (h_GL <> nil) and (not preserveGL) then begin if (assigned(oglInitCB)) then oglInitCB(); end;
+  {$ENDIF}

 {$ENDIF}
 
   result := true;
 {$ENDIF}
 
   result := true;


@@ -210,17 +234,25 @@ begin
 end;
 
 
 end;
 
 

-procedure ChangeWindowSize ();
+procedure ChangeWindowSize (requested: Boolean);

 begin
   e_LogWritefln('  ChangeWindowSize: (ws=%dx%d) (ss=%dx%d)', [gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight]);
   gWinSizeX := gScreenWidth;
   gWinSizeY := gScreenHeight;
 {$IF not DEFINED(HEADLESS)}
 begin
   e_LogWritefln('  ChangeWindowSize: (ws=%dx%d) (ss=%dx%d)', [gWinSizeX, gWinSizeY, gScreenWidth, gScreenHeight]);
   gWinSizeX := gScreenWidth;
   gWinSizeY := gScreenHeight;
 {$IF not DEFINED(HEADLESS)}

-  fuiScrWdt := gScreenWidth;
-  fuiScrHgt := gScreenHeight;
+  {$IFDEF ENABLE_HOLMES}
+    fuiScrWdt := gScreenWidth;
+    fuiScrHgt := gScreenHeight;
+  {$ENDIF}

   e_ResizeWindow(gScreenWidth, gScreenHeight);
   g_Game_SetupScreenSize();
   e_ResizeWindow(gScreenWidth, gScreenHeight);
   g_Game_SetupScreenSize();

-  g_Menu_Reset();
+  {$IF DEFINED(ANDROID)}
+    (* This will fix menu reset on keyboard showing *)
+    if requested then
+      g_Menu_Reset;
+  {$ELSE}
+    g_Menu_Reset;
+  {$ENDIF}

   g_Game_ClearLoading();
 {$ENDIF}
 end;
   g_Game_ClearLoading();
 {$ENDIF}
 end;


@@ -255,7 +287,7 @@ begin
   if result then
   begin
     g_Window_SetDisplay(preserve);
   if result then
   begin
     g_Window_SetDisplay(preserve);

-    ChangeWindowSize();
+    ChangeWindowSize(true);

   end;
 {$ENDIF}
 end;
   end;
 {$ENDIF}
 end;


@@ -282,6 +314,8 @@ begin
     SDL_WINDOWEVENT_MINIMIZED:
     begin
       e_UnpressAllKeys();
     SDL_WINDOWEVENT_MINIMIZED:
     begin
       e_UnpressAllKeys();

+      if (gPlayer1 <> nil) then gPlayer1.releaseAllWeaponSwitchKeys();
+      if (gPlayer2 <> nil) then gPlayer2.releaseAllWeaponSwitchKeys();

       if not wMinimized then
       begin
         e_ResizeWindow(0, 0);
       if not wMinimized then
       begin
         e_ResizeWindow(0, 0);


@@ -311,7 +345,7 @@ begin
         gScreenWidth := ev.data1;
         gScreenHeight := ev.data2;
       end;
         gScreenWidth := ev.data1;
         gScreenHeight := ev.data2;
       end;

-      ChangeWindowSize();
+      ChangeWindowSize(false);

       SwapBuffers();
       if g_debug_WinMsgs then
       begin
       SwapBuffers();
       if g_debug_WinMsgs then
       begin


@@ -325,6 +359,7 @@ begin
 
     SDL_WINDOWEVENT_MAXIMIZED:
     begin
 
     SDL_WINDOWEVENT_MAXIMIZED:
     begin

+      wMaximized := true;

       if wMinimized then
       begin
         e_ResizeWindow(gScreenWidth, gScreenHeight);
       if wMinimized then
       begin
         e_ResizeWindow(gScreenWidth, gScreenHeight);


@@ -344,6 +379,7 @@ begin
 
     SDL_WINDOWEVENT_RESTORED:
     begin
 
     SDL_WINDOWEVENT_RESTORED:
     begin

+      wMaximized := false;

       if wMinimized then
       begin
         e_ResizeWindow(gScreenWidth, gScreenHeight);
       if wMinimized then
       begin
         e_ResizeWindow(gScreenWidth, gScreenHeight);


@@ -368,6 +404,8 @@ begin
     begin
       wDeactivate := true;
       e_UnpressAllKeys();
     begin
       wDeactivate := true;
       e_UnpressAllKeys();

+      if (gPlayer1 <> nil) then gPlayer1.releaseAllWeaponSwitchKeys();
+      if (gPlayer2 <> nil) then gPlayer2.releaseAllWeaponSwitchKeys();

       //e_WriteLog('window lost focus!', MSG_NOTIFY);
     end;
   end;
       //e_WriteLog('window lost focus!', MSG_NOTIFY);
     end;
   end;


@@ -394,7 +432,9 @@ begin
 
       gWinActive := false;
 
 
       gWinActive := false;
 

-      if assigned(winBlurCB) then winBlurCB();
+      {$IFDEF ENABLE_HOLMES}
+        if assigned(winBlurCB) then winBlurCB();
+      {$ENDIF}

     end;
   end
   else if wActivate then
     end;
   end
   else if wActivate then


@@ -417,7 +457,10 @@ begin
       end;
 
       gWinActive := true;
       end;
 
       gWinActive := true;

-      if assigned(winFocusCB) then winFocusCB();
+
+      {$IFDEF ENABLE_HOLMES}
+        if assigned(winFocusCB) then winFocusCB();
+      {$ENDIF}

     end;
   end;
 end;
     end;
   end;
 end;


@@ -455,8 +498,10 @@ begin
     SDL_KEYDOWN, SDL_KEYUP:
       begin
         key := ev.key.keysym.scancode;
     SDL_KEYDOWN, SDL_KEYUP:
       begin
         key := ev.key.keysym.scancode;

+        if key = SDL_SCANCODE_AC_BACK then
+          key := SDL_SCANCODE_ESCAPE;

         down := (ev.type_ = SDL_KEYDOWN);
         down := (ev.type_ = SDL_KEYDOWN);

-        {$IF not DEFINED(HEADLESS)}
+        {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}

         if fuiOnSDLEvent(ev) then
         begin
           // event eaten, but...
         if fuiOnSDLEvent(ev) then
         begin
           // event eaten, but...


@@ -464,11 +509,11 @@ begin
           exit;
         end;
         {$ENDIF}
           exit;
         end;
         {$ENDIF}

-        if down then KeyPress(key);

         e_KeyUpDown(key, down);
         e_KeyUpDown(key, down);

+        if down then KeyPress(key);

       end;
 
       end;
 

-    {$IF not DEFINED(HEADLESS)}
+    {$IF not DEFINED(HEADLESS) and DEFINED(ENABLE_HOLMES)}

     SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION:
       fuiOnSDLEvent(ev);
     {$ENDIF}
     SDL_MOUSEBUTTONDOWN, SDL_MOUSEBUTTONUP, SDL_MOUSEWHEEL, SDL_MOUSEMOTION:
       fuiOnSDLEvent(ev);
     {$ENDIF}


@@ -481,6 +526,9 @@ begin
         if (keychr > 0) and (keychr <= 255) then CharPress(AnsiChar(keychr));
       end;
 
         if (keychr > 0) and (keychr <= 255) then CharPress(AnsiChar(keychr));
       end;
 

+    SDL_FINGERMOTION, SDL_FINGERDOWN, SDL_FINGERUP:
+      g_Touch_HandleEvent(ev.tfinger);
+

     // other key presses and joysticks are handled in e_input
   end;
 end;
     // other key presses and joysticks are handled in e_input
   end;
 end;


@@ -516,9 +564,26 @@ begin
 {$IF not DEFINED(HEADLESS)}
   h_GL := SDL_GL_CreateContext(h_Wnd);
   if (h_GL = nil) then exit;
 {$IF not DEFINED(HEADLESS)}
   h_GL := SDL_GL_CreateContext(h_Wnd);
   if (h_GL = nil) then exit;

-  fuiScrWdt := gScreenWidth;
-  fuiScrHgt := gScreenHeight;
-  if (assigned(oglInitCB)) then oglInitCB();
+  {$IFDEF ENABLE_HOLMES}
+    fuiScrWdt := gScreenWidth;
+    fuiScrHgt := gScreenHeight;
+  {$ENDIF}
+  SDL_GL_MakeCurrent(h_Wnd, h_GL);
+{$IFDEF USE_NANOGL}
+  if nanoGL_Init() = 0 then
+  begin
+    KillGLWindow(false);
+    e_WriteLog('nanoGL initialization error', TMsgType.Fatal);
+    exit;
+  end;
+{$ENDIF}
+{$IFDEF USE_NOGL}
+  nogl_Init;
+{$ENDIF}
+  {$IFDEF ENABLE_HOLMES}
+    if (assigned(oglInitCB)) then oglInitCB();
+  {$ENDIF}
+  if (h_GL <> nil) then g_SetVSync(gVSync);

 {$ENDIF}
 
   e_ResizeWindow(gScreenWidth, gScreenHeight);
 {$ENDIF}
 
   e_ResizeWindow(gScreenWidth, gScreenHeight);


@@ -746,7 +811,7 @@ begin
 end;
 
 
 end;
 
 

-procedure InitOpenGL (vsync: Boolean);
+procedure g_SetVSync (vsync: Boolean);

 {$IF not DEFINED(HEADLESS)}
 var
   v: Byte;
 {$IF not DEFINED(HEADLESS)}
 var
   v: Byte;


@@ -754,15 +819,35 @@ var
 begin
 {$IF not DEFINED(HEADLESS)}
   if vsync then v := 1 else v := 0;
 begin
 {$IF not DEFINED(HEADLESS)}
   if vsync then v := 1 else v := 0;

-  SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
-  SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
-  SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-  SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-  SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-  SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
-  SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-  SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); // lights; it is enough to have 1-bit stencil buffer for lighting, but...
-  SDL_GL_SetSwapInterval(v);
+  if (SDL_GL_SetSwapInterval(v) <> 0) then
+  begin
+    e_WriteLog('oops; can''t change vsync option, restart required', TMsgType.Warning);
+  end
+  else
+  begin
+    if vsync then e_WriteLog('VSync: ON', TMsgType.Notify) else e_WriteLog('VSync: OFF', TMsgType.Notify);
+  end;
+{$ENDIF}
+end;
+
+
+procedure InitOpenGL ();
+begin
+{$IF not DEFINED(HEADLESS)}
+  {$IFDEF USE_GLES1}
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 1);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);    
+  {$ELSE}
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+    SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+    SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+    SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+    SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+    SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); // lights; it is enough to have 1-bit stencil buffer for lighting, but...
+  {$ENDIF}

 {$ENDIF}
 end;
 
 {$ENDIF}
 end;
 


@@ -817,17 +902,21 @@ var
   {$ENDIF}
   arg: AnsiString;
   mdfo: TStream;
   {$ENDIF}
   arg: AnsiString;
   mdfo: TStream;

+  {$IFDEF ENABLE_HOLMES}

   itmp: Integer;
   valres: Word;
   itmp: Integer;
   valres: Word;

+  {$ENDIF}

 begin
 {$IFDEF HEADLESS}
   e_NoGraphics := true;
 {$ELSE}
 begin
 {$IFDEF HEADLESS}
   e_NoGraphics := true;
 {$ELSE}

-  if (not g_holmes_imfunctional) then
-  begin
-    uiInitialize();
-    uiContext.font := 'win14';
-  end;
+  {$IFDEF ENABLE_HOLMES}
+    if (not g_holmes_imfunctional) then
+    begin
+      uiInitialize();
+      uiContext.font := 'win14';
+    end;
+  {$ENDIF}

 {$ENDIF}
 
   idx := 1;
 {$ENDIF}
 
   idx := 1;


@@ -856,6 +945,7 @@ begin
     if arg = '--aimline' then g_dbg_aimline_on := true;
     {.$ENDIF}
 
     if arg = '--aimline' then g_dbg_aimline_on := true;
     {.$ENDIF}
 

+{$IFDEF ENABLE_HOLMES}

     if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
 
     if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then
     if arg = '--holmes' then begin g_holmes_enabled := true; g_Game_SetDebugMode(); end;
 
     if (arg = '--holmes-ui-scale') or (arg = '-holmes-ui-scale') then


@@ -890,6 +980,7 @@ begin
         Inc(idx);
       end;
     end;
         Inc(idx);
       end;
     end;

+{$ENDIF}

 
     if (arg = '--game-scale') or (arg = '-game-scale') then
     begin
 
     if (arg = '--game-scale') or (arg = '-game-scale') then
     begin


@@ -910,12 +1001,13 @@ begin
   end;
 
   e_WriteLog('Initializing OpenGL', TMsgType.Notify);
   end;
 
   e_WriteLog('Initializing OpenGL', TMsgType.Notify);

-  InitOpenGL(gVSync);
+  InitOpenGL();

 
   e_WriteLog('Creating GL window', TMsgType.Notify);
   if not CreateGLWindow(PChar(Format('Doom 2D: Forever %s', [GAME_VERSION]))) then
   begin
     result := 0;
 
   e_WriteLog('Creating GL window', TMsgType.Notify);
   if not CreateGLWindow(PChar(Format('Doom 2D: Forever %s', [GAME_VERSION]))) then
   begin
     result := 0;

+    e_WriteLog('Unable to create GL window: ' + SDL_GetError(), TMsgType.Fatal);

     exit;
   end;
 
     exit;
   end;
 


@@ -931,15 +1023,16 @@ begin
   e_LogWritefln('stencil buffer size: %s', [ltmp]);
   gwin_has_stencil := (ltmp > 0);
 
   e_LogWritefln('stencil buffer size: %s', [ltmp]);
   gwin_has_stencil := (ltmp > 0);
 

-  if not glHasExtension('GL_ARB_texture_non_power_of_two') then
+  if glHasExtension('GL_ARB_texture_non_power_of_two') or
+     glHasExtension('GL_OES_texture_npot') then

   begin
   begin

-    e_WriteLog('NPOT textures: NO', TMsgType.Warning);
-    glLegacyNPOT := true;
+    e_WriteLog('NPOT textures: YES', TMsgType.Notify);
+    glLegacyNPOT := false;

   end
   else
   begin
   end
   else
   begin

-    e_WriteLog('NPOT textures: YES', TMsgType.Notify);
-    glLegacyNPOT := false;
+    e_WriteLog('NPOT textures: NO', TMsgType.Warning);
+    glLegacyNPOT := true;

   end;
   gwin_dump_extensions := false;
 {$ENDIF}
   end;
   gwin_dump_extensions := false;
 {$ENDIF}