edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5000

Browse source 
5000: Inform about client restart when changing GPU r=Jupeyy a=def-

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [x] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2022-04-18 08:22:18 +00:00 committed by GitHub
parent fdcb1576bd 87b7550a4a
commit c39448ca53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/client/components/menus_settings.cpp
View file

@ -1123,7 +1123,9 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
static int s_NumNodes = Graphics()->GetVideoModes(s_aModes, MAX_RESOLUTIONS, g_Config.m_GfxScreen); static int s_NumNodes = Graphics()->GetVideoModes(s_aModes, MAX_RESOLUTIONS, g_Config.m_GfxScreen);
static int s_GfxFsaaSamples = g_Config.m_GfxFsaaSamples; static int s_GfxFsaaSamples = g_Config.m_GfxFsaaSamples;
static bool s_GfxBackendChanged = false; static bool s_GfxBackendChanged = false;
static bool s_GfxGPUChanged = false;
static int s_GfxHighdpi = g_Config.m_GfxHighdpi; static int s_GfxHighdpi = g_Config.m_GfxHighdpi;
static int s_InitDisplayAllVideoModes = g_Config.m_GfxDisplayAllVideoModes; static int s_InitDisplayAllVideoModes = g_Config.m_GfxDisplayAllVideoModes;
static bool s_WasInit = false; static bool s_WasInit = false;
@ -1206,6 +1208,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
static int s_WindowModeDropDownState = 0; static int s_WindowModeDropDownState = 0;
static int s_OldSelectedBackend = -1; static int s_OldSelectedBackend = -1;
static int s_OldSelectedGPU = -1;
OldSelected = (g_Config.m_GfxFullscreen ? (g_Config.m_GfxFullscreen == 1 ? 4 : (g_Config.m_GfxFullscreen == 2 ? 3 : 2)) : (g_Config.m_GfxBorderless ? 1 : 0)); OldSelected = (g_Config.m_GfxFullscreen ? (g_Config.m_GfxFullscreen == 1 ? 4 : (g_Config.m_GfxFullscreen == 2 ? 3 : 2)) : (g_Config.m_GfxBorderless ? 1 : 0));
@ -1475,6 +1478,9 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
static int s_GPUCount = 0; static int s_GPUCount = 0;
s_GPUCount = GPUCount; s_GPUCount = GPUCount;
if(s_OldSelectedGPU == -1)
s_OldSelectedGPU = OldSelectedGPU;
const int NewGPU = RenderDropDown(s_GPUDropDownState, &MainView, OldSelectedGPU, vGPUIDPtrs.data(), vGPUIDNames.data(), s_GPUCount, &s_GPUCount, s_ScrollValueDropGPU); const int NewGPU = RenderDropDown(s_GPUDropDownState, &MainView, OldSelectedGPU, vGPUIDPtrs.data(), vGPUIDNames.data(), s_GPUCount, &s_GPUCount, s_ScrollValueDropGPU);
if(OldSelectedGPU != NewGPU) if(OldSelectedGPU != NewGPU)
{ {
@ -1482,6 +1488,8 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
str_copy(g_Config.m_GfxGPUName, "auto", sizeof(g_Config.m_GfxGPUName)); str_copy(g_Config.m_GfxGPUName, "auto", sizeof(g_Config.m_GfxGPUName));
else else
str_copy(g_Config.m_GfxGPUName, GPUList.m_GPUs[NewGPU - 1].m_Name, sizeof(g_Config.m_GfxGPUName)); str_copy(g_Config.m_GfxGPUName, GPUList.m_GPUs[NewGPU - 1].m_Name, sizeof(g_Config.m_GfxGPUName));
CheckSettings = true;
s_GfxGPUChanged = NewGPU != s_OldSelectedGPU;
} }
} }
@ -1490,6 +1498,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
{ {
m_NeedRestartGraphics = !(s_GfxFsaaSamples == g_Config.m_GfxFsaaSamples && m_NeedRestartGraphics = !(s_GfxFsaaSamples == g_Config.m_GfxFsaaSamples &&
!s_GfxBackendChanged && !s_GfxBackendChanged &&
!s_GfxGPUChanged &&
s_GfxHighdpi == g_Config.m_GfxHighdpi); s_GfxHighdpi == g_Config.m_GfxHighdpi);
} }
} }