Added support OpenGL ES 1.1 through nanoGL (have some bugs) and fix build for ARM

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

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 345f11232604bd161208a4f3f0d92e32b7c75982..726d37038339aa875cda8b0af270090a4ed78324 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -351,12 +351,17 @@ function gPause (): Boolean; inline;
 implementation
 
 uses
 implementation
 
 uses

+{$IFDEF USE_NANOGL}
+  nanoGL,
+{$ELSE}
+  GL, GLExt,
+{$ENDIF}

   e_texture, g_textures, g_main, g_window, g_menu,
   e_input, e_log, g_console, g_items, g_map, g_panel,
   g_playermodel, g_gfx, g_options, g_weapons, Math,
   g_triggers, g_monsters, e_sound, CONFIG,
   g_language, g_net,
   e_texture, g_textures, g_main, g_window, g_menu,
   e_input, e_log, g_console, g_items, g_map, g_panel,
   g_playermodel, g_gfx, g_options, g_weapons, Math,
   g_triggers, g_monsters, e_sound, CONFIG,
   g_language, g_net,

-  ENet, e_msg, g_netmsg, g_netmaster, GL, GLExt,
+  ENet, e_msg, g_netmsg, g_netmaster,

   sfs, wadreader, g_holmes;
 
 
   sfs, wadreader, g_holmes;
 
 


@@ -3002,8 +3007,11 @@ begin
    *     glBlendFunc(GL_DST_ALPHA, GL_ONE);
    *     draw all geometry up to and including walls (with alpha-testing, probably) -- this does lighting
    *)
    *     glBlendFunc(GL_DST_ALPHA, GL_ONE);
    *     draw all geometry up to and including walls (with alpha-testing, probably) -- this does lighting
    *)

-
+{$IFDEF USE_NANOGL}
+  wassc := false; // FIXIT
+{$ELSE}

   wassc := (glIsEnabled(GL_SCISSOR_TEST) <> 0);
   wassc := (glIsEnabled(GL_SCISSOR_TEST) <> 0);

+{$ENDIF}

   if wassc then glGetIntegerv(GL_SCISSOR_BOX, @scxywh[0]) else glGetIntegerv(GL_VIEWPORT, @scxywh[0]);
 
   // setup OpenGL parameters
   if wassc then glGetIntegerv(GL_SCISSOR_BOX, @scxywh[0]) else glGetIntegerv(GL_VIEWPORT, @scxywh[0]);
 
   // setup OpenGL parameters