diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 7f542509b7b9febaf98200f072db129d08de578d..e57defe11cf4067a739f8f8c986dba9fef8f763b 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
uses
{$IFDEF WINDOWS}Windows,{$ENDIF}
-{$IFDEF USE_NANOGL}
- nanoGL,
-{$ELSE}
- GL, GLExt,
-{$ENDIF}
+{$INCLUDE ../nogl/noGLuses.inc}
{$IFDEF ENABLE_HOLMES}
g_holmes, sdlcarcass, fui_ctls,
{$ENDIF}
if (h_Wnd <> nil) then SDL_DestroyWindow(h_Wnd);
if (h_GL <> nil) and (not preserveGL) then
begin
+
{$IFDEF USE_NANOGL}
nanoGL_Destroy;
-{$ENDIF USE_NANOGL}
+{$ENDIF}
+
+{$IFDEF USE_NOGL}
+ nogl_Quit;
+{$ENDIF}
+
SDL_GL_DeleteContext(h_GL);
end;
h_Wnd := nil;
e_WriteLog('nanoGL initialization error', TMsgType.Fatal);
exit;
end;
+{$ENDIF}
+{$IFDEF USE_NOGL}
+ nogl_Init;
{$ENDIF}
{$IFDEF ENABLE_HOLMES}
if (assigned(oglInitCB)) then oglInitCB();
procedure InitOpenGL ();
begin
{$IF not DEFINED(HEADLESS)}
- {$IFDEF USE_NANOGL}
+ {$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);