mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-26 21:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove global g_xres and x_yres

Browse Source 
Instead query g_VideoMode where needed. As both g_xres and g_yres aren't
global anymore remove static from UpdateRenderer. While at it use more
desicriptive names: GetXRes -> GetWindowWidth, GetYRes ->
GetWindowHeight.

This reduces the amount of variables tracking width and height by one
each.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2026-07-07 19:03:08 +02:00
parent b588b62304
commit 99bbc24265
17 changed files with 50 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/VideoMode.cpp
+6 -9
View File
@@ -550,9 +550,6 @@ bool CVideoMode::SetVideoMode(int w, int h, int bpp, bool fullscreen)
m_IsFullscreen = fullscreen;
g_xres = m_CurrentW;
g_yres = m_CurrentH;
return true;
}
@@ -733,9 +730,9 @@ void CVideoMode::RecreateSwapChain()
if (m_BackendDevice)
{
char nameBuffer[64];
snprintf(nameBuffer, std::size(nameBuffer), "SwapChain: %dx%d", g_xres, g_yres);
snprintf(nameBuffer, std::size(nameBuffer), "SwapChain: %dx%d", m_CurrentW, m_CurrentH);
m_SwapChain = m_BackendDevice->CreateSwapChain(
nameBuffer, m_Window, g_xres, g_yres, m_ConfigVSync, std::move(m_SwapChain));
nameBuffer, m_Window, m_CurrentW, m_CurrentH, m_ConfigVSync, std::move(m_SwapChain));
}
}
@@ -876,8 +873,8 @@ void CVideoMode::UpdateRenderer(int w, int h)
if (w < 2) w = 2; // avoid GL errors caused by invalid sizes
if (h < 2) h = 2;
g_xres = w;
g_yres = h;
m_CurrentW = w;
m_CurrentH = h;
SViewPort vp = { 0, 0, w, h };
@@ -915,13 +912,13 @@ int CVideoMode::GetBestBPP()
return 32;
}
int CVideoMode::GetXRes() const
int CVideoMode::GetWindowWidth() const
{
ENSURE(m_IsInitialised);
return m_CurrentW;
}
int CVideoMode::GetYRes() const
int CVideoMode::GetWindowHeight() const
{
ENSURE(m_IsInitialised);
return m_CurrentH;