From 96834fa5248a49e9f68ae9c6f3666b813c67c014 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Wed, 12 Apr 2017 03:21:43 +0200 Subject: [PATCH 1/2] - Turn off vid_glswfb, gl_es on Linux ARM and stop saving it in the config file until it fully works --- src/posix/sdl/sdlglvideo.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index 106b98d79..2a4b869a7 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -62,17 +62,20 @@ CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINI { Printf("This won't take effect until " GAMENAME " is restarted.\n"); } -CUSTOM_CVAR(Bool, vid_glswfb, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) +#ifdef __arm__ +CUSTOM_CVAR(Bool, vid_glswfb, true, CVAR_NOINITCALL) { Printf("This won't take effect until " GAMENAME " is restarted.\n"); } - -#ifdef __arm__ -CUSTOM_CVAR(Bool, gl_es, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) +CUSTOM_CVAR(Bool, gl_es, false, CVAR_NOINITCALL) { Printf("This won't take effect until " GAMENAME " is restarted.\n"); } #else +CUSTOM_CVAR(Bool, vid_glswfb, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) +{ + Printf("This won't take effect until " GAMENAME " is restarted.\n"); +} CUSTOM_CVAR(Bool, gl_es, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) { Printf("This won't take effect until " GAMENAME " is restarted.\n"); From df8fa1274a988da4a6d9ef08fcafbf16bb77603d Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Wed, 12 Apr 2017 03:22:38 +0200 Subject: [PATCH 2/2] - Oops, forgot to actually disable vid_glswfb in last commit --- src/posix/sdl/sdlglvideo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp index 2a4b869a7..1e602f102 100644 --- a/src/posix/sdl/sdlglvideo.cpp +++ b/src/posix/sdl/sdlglvideo.cpp @@ -63,7 +63,7 @@ CUSTOM_CVAR(Bool, gl_debug, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINI Printf("This won't take effect until " GAMENAME " is restarted.\n"); } #ifdef __arm__ -CUSTOM_CVAR(Bool, vid_glswfb, true, CVAR_NOINITCALL) +CUSTOM_CVAR(Bool, vid_glswfb, false, CVAR_NOINITCALL) { Printf("This won't take effect until " GAMENAME " is restarted.\n"); }