diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index 561fd9721..b945b046e 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -16,6 +16,7 @@ #include #include +#include "../d_main.h" #include "../doomstat.h" #include "../doomdef.h" @@ -204,7 +205,8 @@ static CV_PossibleValue_t glpalettedepth_cons_t[] = {{16, "16 bits"}, {24, "24 b consvar_t cv_glscreentextures = {"gr_screentextures", "All", CV_CALL|CV_SAVE, glscreentextures_cons_t, CV_screentextures_OnChange, 0, NULL, NULL, 0, 0, NULL}; #ifdef USE_FBO_OGL -consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t glframebuffer_cons_t[] = {{0, "Off"}, {1, "Downsample"}, {2, "Always"}, {0, NULL}}; +consvar_t cv_glframebuffer = {"gr_framebuffer", "Off", CV_SAVE|CV_CALL, glframebuffer_cons_t, CV_glframebuffer_OnChange, 0, NULL, NULL, 0, 0, NULL}; #endif consvar_t cv_glmdls = {"gr_mdls", "Off", CV_SAVE|CV_CALL, CV_OnOff, M_UpdateOGLMenu, 0, NULL, NULL, 0, 0, NULL}; @@ -267,8 +269,8 @@ static void CV_glframebuffer_OnChange(void) // screen FBO needs screen textures currently if (cv_glframebuffer.value != 0 && ((cv_glscreentextures.value != 2) || !supportFBO)) CV_StealthSetValue(&cv_glframebuffer, 0); // dont recursively call this lul - - I_CheckDownSampleState(true); + if (loaded_config) // dont do this crap on startup, this is handled elsewhere + I_CheckDownSampleState(true); M_UpdateOGLMenu(); intermissionbginit = false; } diff --git a/src/m_menudefs.c b/src/m_menudefs.c index 4a00f3020..bc52db949 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -1004,7 +1004,7 @@ static menuitem_t OP_ExpOptionsMenu[] = #ifdef HWRENDER {IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 95}, #ifdef USE_FBO_OGL - {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 100}, + {IT_STRING | IT_CVAR, NULL, "FBO support", &cv_glframebuffer, 100}, {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110}, {IT_DISABLED, NULL, "", NULL, 120}, // dummy text #else @@ -1030,7 +1030,7 @@ static const char* OP_ExpTooltips[] = #ifdef HWRENDER "Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!", #ifdef USE_FBO_OGL - "Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nRequires a GPU with atleast OpenGL 2.1 support.", + "Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nThis can be set to automatically enable if the game resolution\nis higher than the current Display Resolution\nor enabled at all times.\nThis may improve performance in some cases.\nRequires a GPU with atleast OpenGL 2.1 support.", #endif "Change the bit depth of the Lookup Palette in Palette rendering mode\n 16 bits is like software looks ingame\nwhile 24 bits is how software looks in screenshots.", #endif diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c index d2767307a..83bf7d8af 100644 --- a/src/sdl/ogl_sdl.c +++ b/src/sdl/ogl_sdl.c @@ -65,7 +65,7 @@ PFNglGetString pglGetString; #ifdef USE_FBO_OGL boolean UseScreenFBO(void) { - return (supportFBO && cv_glframebuffer.value && I_IsDownsampling() && (cv_glscreentextures.value == 2)); + return (supportFBO && cv_glframebuffer.value && (cv_glscreentextures.value == 2) && (cv_glframebuffer.value == 2 || I_IsDownsampling())); } #endif