From 3b53f31da33e4a06b9b1af6e25151d0e39cf7106 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 28 Jul 2018 10:05:16 +0200 Subject: [PATCH] - default to fullscreen display. --- src/d_main.cpp | 1 - src/gl/system/gl_framebuffer.cpp | 1 - src/posix/cocoa/i_main.mm | 1 - src/posix/cocoa/i_video.mm | 1 - src/posix/sdl/hardware.cpp | 2 -- src/posix/sdl/i_input.cpp | 1 - src/posix/sdl/sdlglvideo.cpp | 1 - src/v_video.cpp | 2 -- src/v_video.h | 6 ++++++ src/win32/base_sysfb.cpp | 3 --- src/win32/gl_sysfb.cpp | 4 ---- src/win32/hardware.cpp | 1 - src/win32/i_system.cpp | 1 - src/win32/win32basevideo.cpp | 1 - src/win32/win32glvideo.cpp | 1 - 15 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 6d16ccc4b..4d113c4d7 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -103,7 +103,6 @@ #include "r_data/r_vanillatrans.h" EXTERN_CVAR(Bool, hud_althud) -EXTERN_CVAR(Bool, fullscreen) EXTERN_CVAR(Int, vr_mode) void DrawHUD(); void D_DoAnonStats(); diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp index ef35b5584..b03b31968 100644 --- a/src/gl/system/gl_framebuffer.cpp +++ b/src/gl/system/gl_framebuffer.cpp @@ -466,7 +466,6 @@ void OpenGLFrameBuffer::GetScreenshotBuffer(const uint8_t *&buffer, int &pitch, buffer = ScreenshotBuffer; // Screenshot should not use gamma correction if it was already applied to rendered image - EXTERN_CVAR(Bool, fullscreen); gamma = 1 == vid_hwgamma || (2 == vid_hwgamma && !fullscreen) ? 1.0f : Gamma; } diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm index fbb1cfd0f..d20a40e83 100644 --- a/src/posix/cocoa/i_main.mm +++ b/src/posix/cocoa/i_main.mm @@ -56,7 +56,6 @@ CVAR (Bool, i_soundinbackground, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) EXTERN_CVAR(Int, vid_defwidth ) EXTERN_CVAR(Int, vid_defheight) EXTERN_CVAR(Bool, vid_vsync ) -EXTERN_CVAR(Bool, fullscreen ) // --------------------------------------------------------------------------- diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm index edd1066de..71cb466fe 100644 --- a/src/posix/cocoa/i_video.mm +++ b/src/posix/cocoa/i_video.mm @@ -88,7 +88,6 @@ EXTERN_CVAR(Bool, vid_vsync) EXTERN_CVAR(Bool, vid_hidpi) EXTERN_CVAR(Int, vid_defwidth) EXTERN_CVAR(Int, vid_defheight) -EXTERN_CVAR(Bool, fullscreen) CVAR(Int, win_x, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Int, win_y, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) diff --git a/src/posix/sdl/hardware.cpp b/src/posix/sdl/hardware.cpp index 260149ff2..faf1b4988 100644 --- a/src/posix/sdl/hardware.cpp +++ b/src/posix/sdl/hardware.cpp @@ -42,8 +42,6 @@ #include "m_argv.h" #include "swrenderer/r_swrenderer.h" -EXTERN_CVAR (Bool, fullscreen) - IVideo *Video; void I_RestartRenderer(); diff --git a/src/posix/sdl/i_input.cpp b/src/posix/sdl/i_input.cpp index 82bdaab3f..cc40b4fde 100644 --- a/src/posix/sdl/i_input.cpp +++ b/src/posix/sdl/i_input.cpp @@ -57,7 +57,6 @@ CVAR (Bool, use_mouse, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Bool, m_noprescale, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Bool, m_filter, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) -EXTERN_CVAR (Bool, fullscreen) extern int WaitingForKey, chatmodeon; extern constate_e ConsoleState; diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index 7eb389ae1..55e4b21e4 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -70,7 +70,6 @@ EXTERN_CVAR (Int, vid_displaybits) EXTERN_CVAR (Int, vid_maxfps) EXTERN_CVAR (Int, vid_defwidth) EXTERN_CVAR (Int, vid_defheight) -EXTERN_CVAR (Bool, fullscreen) EXTERN_CVAR (Bool, cl_capfps) // PUBLIC DATA DEFINITIONS ------------------------------------------------- diff --git a/src/v_video.cpp b/src/v_video.cpp index df6a86ccf..aebd3b316 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -104,8 +104,6 @@ int active_con_scale(); FRenderer *SWRenderer; -EXTERN_CVAR (Bool, fullscreen) - #define DBGBREAK assert(0) class DDummyFrameBuffer : public DFrameBuffer diff --git a/src/v_video.h b/src/v_video.h index 74d0b0db7..f5cc1b725 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -88,6 +88,12 @@ void V_OutputResized (int width, int height); void V_CalcCleanFacs (int designwidth, int designheight, int realwidth, int realheight, int *cleanx, int *cleany, int *cx1=NULL, int *cx2=NULL); EXTERN_CVAR(Int, vid_rendermode) +EXTERN_CVAR(Bool, fullscreen) +EXTERN_CVAR(Int, win_x) +EXTERN_CVAR(Int, win_y) +EXTERN_CVAR(Int, win_w) +EXTERN_CVAR(Int, win_h) + inline bool V_IsHardwareRenderer() { diff --git a/src/win32/base_sysfb.cpp b/src/win32/base_sysfb.cpp index 550eb9639..8e07468e4 100644 --- a/src/win32/base_sysfb.cpp +++ b/src/win32/base_sysfb.cpp @@ -67,11 +67,8 @@ CVAR(Int, win_y, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Int, win_w, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Int, win_h, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) CVAR(Bool, win_maximized, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) - EXTERN_CVAR(Int, vid_defwidth) EXTERN_CVAR(Int, vid_defheight) -EXTERN_CVAR(Bool, fullscreen) - //========================================================================== // diff --git a/src/win32/gl_sysfb.cpp b/src/win32/gl_sysfb.cpp index 522940858..f966454e3 100644 --- a/src/win32/gl_sysfb.cpp +++ b/src/win32/gl_sysfb.cpp @@ -67,10 +67,6 @@ CUSTOM_CVAR(Bool, vr_enable_quadbuffered, false, CVAR_ARCHIVE | CVAR_GLOBALCONFI Printf("You must restart " GAMENAME " to switch quad stereo mode\n"); } -EXTERN_CVAR(Int, vid_defwidth) -EXTERN_CVAR(Int, vid_defheight) - - //========================================================================== // // Windows framebuffer diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp index 6c4fd007b..aa5671f28 100644 --- a/src/win32/hardware.cpp +++ b/src/win32/hardware.cpp @@ -46,7 +46,6 @@ #include "win32glvideo.h" #include "swrenderer/r_swrenderer.h" -EXTERN_CVAR (Bool, fullscreen) EXTERN_CVAR(Int, vid_maxfps) extern HWND Window; diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index 2a49a2426..44d2d4395 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -114,7 +114,6 @@ static void DestroyCustomCursor(); EXTERN_CVAR(String, language); EXTERN_CVAR (Bool, queryiwad); // Used on welcome/IWAD screen. -EXTERN_CVAR (Bool, fullscreen) EXTERN_CVAR (Bool, disableautoload) EXTERN_CVAR (Bool, autoloadlights) EXTERN_CVAR (Bool, autoloadbrightmaps) diff --git a/src/win32/win32basevideo.cpp b/src/win32/win32basevideo.cpp index a444b7da2..42863da86 100644 --- a/src/win32/win32basevideo.cpp +++ b/src/win32/win32basevideo.cpp @@ -55,7 +55,6 @@ CVAR(Int, vid_adapter, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) -EXTERN_CVAR(Bool, fullscreen) EXTERN_CVAR(Bool, vr_enable_quadbuffered) //========================================================================== diff --git a/src/win32/win32glvideo.cpp b/src/win32/win32glvideo.cpp index 2da91f9e2..273a70053 100644 --- a/src/win32/win32glvideo.cpp +++ b/src/win32/win32glvideo.cpp @@ -54,7 +54,6 @@ #include "gl/system/gl_framebuffer.h" EXTERN_CVAR(Int, vid_adapter) -EXTERN_CVAR(Bool, fullscreen) EXTERN_CVAR(Bool, vr_enable_quadbuffered) CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)