From b5f0859173cc97002614f9c39da49e719b3571cb Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Wed, 9 Jun 2021 14:54:39 +0300 Subject: [PATCH] render: remove g_window dependency on r_graphics and GL --- src/game/Doom2DF.lpr | 1 + src/game/g_window.pas | 140 ++++------------------------------- src/game/opengl/r_window.pas | 140 +++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 127 deletions(-) create mode 100644 src/game/opengl/r_window.pas diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr index 0434ce2..b18fae8 100644 --- a/src/game/Doom2DF.lpr +++ b/src/game/Doom2DF.lpr @@ -165,6 +165,7 @@ uses r_player in 'opengl/r_player.pas', r_playermodel in 'opengl/r_playermodel.pas', r_weapons in 'opengl/r_weapons.pas', + r_window in 'opengl/r_window.pas', {$IFDEF USE_FMOD} fmod in '../lib/FMOD/fmod.pas', diff --git a/src/game/g_window.pas b/src/game/g_window.pas index b4e2f7b..4e84b5d 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -25,7 +25,6 @@ procedure ResetTimer (); procedure ProcessLoading (forceUpdate: Boolean=false); var - gwin_dump_extensions: Boolean = false; gwin_has_stencil: Boolean = false; gwin_k8_enable_light_experiments: Boolean = false; g_dbg_aimline_on: Boolean = false; @@ -38,24 +37,18 @@ uses {$IFDEF ENABLE_HOLMES} g_holmes, sdlcarcass, fui_ctls, {$ENDIF} -{$INCLUDE ../nogl/noGLuses.inc} SysUtils, Classes, MAPDEF, Math, - r_graphics, e_log, e_texture, g_main, - g_console, r_console, e_input, g_options, g_game, r_game, + r_window, e_log, g_main, + g_console, r_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, xprofiler, g_touch, g_gui, g_system, g_netmaster; - -const - ProgressUpdateMSecs = 35; //1;//100; - var Time, Time_Delta, Time_Old: Int64; Frame: Int64; flag: Boolean; wNeedTimeReset: Boolean = false; - wMinimized: Boolean = false; wLoadingQuit: Boolean = false; procedure ResetTimer (); @@ -63,59 +56,21 @@ begin wNeedTimeReset := true; end; -{$IFNDEF HEADLESS} -var - prevLoadingUpdateTime: UInt64 = 0; -{$ENDIF} - procedure ProcessLoading (forceUpdate: Boolean=false); -{$IFNDEF HEADLESS} -var - stt: UInt64; -{$ENDIF} begin if sys_HandleInput() = True then Exit; {$IFNDEF HEADLESS} - if not wMinimized then - begin - if not forceUpdate then - begin - stt := getTimeMilli(); - forceUpdate := (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= ProgressUpdateMSecs); - end; - - if forceUpdate then - begin - e_SetRendertarget(True); - e_SetViewPort(0, 0, gScreenWidth, gScreenHeight); - - r_Game_DrawMenuBackground('INTER'); - e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); - r_Game_DrawLoadingStat(); - r_Console_Draw(True); - - e_SetRendertarget(False); - e_SetViewPort(0, 0, gWinSizeX, gWinSizeY); - e_BlitFramebuffer(gWinSizeX, gWinSizeY); - - sys_Repaint; - prevLoadingUpdateTime := getTimeMilli(); - end; - end; + r_Window_DrawLoading(forceUpdate); {$ENDIF} e_SoundUpdate(); if NetMode = NET_SERVER then - begin - g_Net_Host_Update(); - end - else - begin - if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading(); - end; + g_Net_Host_Update() + else if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then + g_Net_Client_UpdateWhileLoading(); end; @@ -173,15 +128,12 @@ begin if flag then begin - if (not wMinimized) then - begin - if gPause or (not gLerpActors) or (gState = STATE_FOLD) then - gLerpFactor := 1.0 - else - gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0); - Draw; - sys_Repaint - end; + if gPause or (not gLerpActors) or (gState = STATE_FOLD) then + gLerpFactor := 1.0 + else + gLerpFactor := nmin(1.0, (Time - Time_Old) / 28.0); + Draw; + sys_Repaint; Frame := Time end else @@ -190,54 +142,6 @@ 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) and (s[i] = ' ') do Inc(i); - 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+1, 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 - exts: SSArray; - e: AnsiString; -begin - result := false; - exts := GLExtensionList(); - for e in exts do - begin - //writeln('<', e, '> : [', ext, '] = ', strEquCI1251(e, ext)); - if (strEquCI1251(e, ext)) then begin result := true; exit; end; - 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; @@ -254,7 +158,6 @@ begin begin arg := ParamStr(idx); Inc(idx); - if arg = '--opengl-dump-exts' then gwin_dump_extensions := true; //if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true; if arg = '--jah' then g_profile_history_size := 100; if arg = '--no-particles' then gpart_dbg_enabled := false; @@ -341,24 +244,7 @@ begin end; end; -{$IFNDEF USE_SYSSTUB} - PrintGLSupportedExtensions; - glLegacyNPOT := not (GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot')); -{$ELSE} - glLegacyNPOT := False; - glRenderToFBO := False; -{$ENDIF} - if glNPOTOverride and glLegacyNPOT then - begin - glLegacyNPOT := true; - e_logWriteln('NPOT texture emulation: FORCED'); - end - else - begin - if (glLegacyNPOT) then e_logWriteln('NPOT texture emulation: enabled') - else e_logWriteln('NPOT texture emulation: disabled'); - end; - gwin_dump_extensions := false; + r_Window_Initialize; Init; Time_Old := sys_GetTicks(); diff --git a/src/game/opengl/r_window.pas b/src/game/opengl/r_window.pas new file mode 100644 index 0000000..a35aaef --- /dev/null +++ b/src/game/opengl/r_window.pas @@ -0,0 +1,140 @@ +(* Copyright (C) Doom 2D: Forever Developers + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3 of the License ONLY. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + *) +{$INCLUDE ../../shared/a_modes.inc} +unit r_window; + +interface + + procedure r_Window_DrawLoading (forceUpdate: Boolean); + procedure r_Window_Initialize; + +implementation + + uses + {$INCLUDE ../nogl/noGLuses.inc} + SysUtils, Classes, + e_log, utils, + r_graphics, r_game, r_console, g_system, + g_options, g_game, g_console, + xprofiler + ; + + const + ProgressUpdateMSecs = 35; //1;//100; + + var + prevLoadingUpdateTime: UInt64; + + procedure r_Window_DrawLoading (forceUpdate: Boolean); + var stt: UInt64; + begin + if e_NoGraphics = False then + begin + if not forceUpdate then + begin + stt := getTimeMilli(); + forceUpdate := (stt < prevLoadingUpdateTime) or (stt-prevLoadingUpdateTime >= ProgressUpdateMSecs); + end; + + if forceUpdate then + begin + e_SetRendertarget(True); + e_SetViewPort(0, 0, gScreenWidth, gScreenHeight); + + r_Game_DrawMenuBackground('INTER'); + e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150); + r_Game_DrawLoadingStat(); + r_Console_Draw(True); + + e_SetRendertarget(False); + e_SetViewPort(0, 0, gWinSizeX, gWinSizeY); + e_BlitFramebuffer(gWinSizeX, gWinSizeY); + + sys_Repaint; + prevLoadingUpdateTime := getTimeMilli(); + end; + end; + 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) and (s[i] = ' ') do Inc(i); + 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+1, 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 e: AnsiString; + begin + result := false; + for e in GLExtensionList() do + begin + if strEquCI1251(e, ext) then + begin + result := true; + exit + end + 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; + + procedure r_Window_Initialize; + begin +{$IFNDEF USE_SYSSTUB} + PrintGLSupportedExtensions; + glLegacyNPOT := not (GLExtensionSupported('GL_ARB_texture_non_power_of_two') or GLExtensionSupported('GL_OES_texture_npot')); +{$ELSE} + glLegacyNPOT := False; + glRenderToFBO := False; +{$ENDIF} + if glNPOTOverride and glLegacyNPOT then + begin + glLegacyNPOT := true; + e_logWriteln('NPOT texture emulation: FORCED') + end + else + begin + if glLegacyNPOT then + e_logWriteln('NPOT texture emulation: enabled') + else + e_logWriteln('NPOT texture emulation: disabled') + end + end; + +end. -- 2.29.2