From dfa5a3cd071503e5cc125ba836a2a8822d50cdac Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 30 Apr 2017 16:18:19 -0400 Subject: [PATCH] - Changed cocoa backend's s_currentRenderer to match PC version's 'currentrenderer' to address a possible Mac compilation issue. --- src/posix/cocoa/i_video.mm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm index 67f23fc5a..cf77b250f 100644 --- a/src/posix/cocoa/i_video.mm +++ b/src/posix/cocoa/i_video.mm @@ -157,14 +157,14 @@ CUSTOM_CVAR(Bool, vid_autoswitch, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_ Printf("You must restart " GAMENAME " to apply graphics switching mode\n"); } -static int s_currentRenderer; +int currentrenderer; CUSTOM_CVAR(Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) { // 0: Software renderer // 1: OpenGL renderer - if (self != s_currentRenderer) + if (self != currentrenderer) { switch (self) { @@ -657,7 +657,7 @@ DFrameBuffer* CocoaVideo::CreateFrameBuffer(const int width, const int height, c DFrameBuffer* fb = NULL; - if (1 == s_currentRenderer) + if (1 == currentrenderer) { fb = new OpenGLFrameBuffer(NULL, width, height, 32, 60, fullscreen); } @@ -1360,13 +1360,13 @@ static void I_DeleteRenderer() void I_CreateRenderer() { - s_currentRenderer = vid_renderer; + currentrenderer = vid_renderer; if (NULL == Renderer) { extern FRenderer* gl_CreateInterface(); - Renderer = 1 == s_currentRenderer + Renderer = 1 == currentrenderer ? gl_CreateInterface() : new FSoftwareRenderer; atterm(I_DeleteRenderer);