X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fopengl%2Fr_window.pas;h=3e4075fe0d615bbdb1ccae719632740f48cc4060;hb=6837a957a80cae5f212cc5a1447b2e7dac15c159;hp=a35aaeff85842493e4df5fe2b7aafda01b8e7cfb;hpb=bdc337737cb5dfc45d8733fcdd1610d28ea02a33;p=d2df-sdl.git diff --git a/src/game/opengl/r_window.pas b/src/game/opengl/r_window.pas index a35aaef..3e4075f 100644 --- a/src/game/opengl/r_window.pas +++ b/src/game/opengl/r_window.pas @@ -18,15 +18,17 @@ unit r_window; interface procedure r_Window_DrawLoading (forceUpdate: Boolean); - procedure r_Window_Initialize; implementation uses {$INCLUDE ../nogl/noGLuses.inc} + {$IFDEF ENABLE_SYSTEM} + g_system, + {$ENDIF} SysUtils, Classes, e_log, utils, - r_graphics, r_game, r_console, g_system, + r_graphics, r_game, r_console, g_options, g_game, g_console, xprofiler ; @@ -62,79 +64,12 @@ implementation e_SetViewPort(0, 0, gWinSizeX, gWinSizeY); e_BlitFramebuffer(gWinSizeX, gWinSizeY); - sys_Repaint; + {$IFDEF ENABLE_SYSTEM} + sys_Repaint; + {$ENDIF} 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.