zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-28 06:42:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add vid_max_width and vid_max_height

Browse source
This commit is contained in:
Magnus Norddahl 2016-10-12 08:05:31 +02:00
parent 403b3e2319
commit c5ebfd9e65
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gl/system/gl_swframebuffer.cpp
View file

@ -86,6 +86,15 @@ EXTERN_CVAR(Bool, vid_vsync)
EXTERN_CVAR(Float, transsouls) EXTERN_CVAR(Float, transsouls)
EXTERN_CVAR(Int, vid_refreshrate) EXTERN_CVAR(Int, vid_refreshrate)
CVAR(Int, vid_max_width, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Int, vid_max_height, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
namespace
{
int ClampWidth(int width) { return (vid_max_width == 0 || width < vid_max_width) ? width : vid_max_width; }
int ClampHeight(int height) { return (vid_max_height == 0 || height < vid_max_height) ? height : vid_max_height; }
}
extern cycle_t BlitCycles; extern cycle_t BlitCycles;
void gl_LoadExtensions(); void gl_LoadExtensions();
@ -121,7 +130,7 @@ const char *const OpenGLSWFrameBuffer::ShaderDefines[OpenGLSWFrameBuffer::NUM_SH
}; };
OpenGLSWFrameBuffer::OpenGLSWFrameBuffer(void *hMonitor, int width, int height, int bits, int refreshHz, bool fullscreen, bool bgra) : OpenGLSWFrameBuffer::OpenGLSWFrameBuffer(void *hMonitor, int width, int height, int bits, int refreshHz, bool fullscreen, bool bgra) :
Super(hMonitor, width, height, bits, refreshHz, fullscreen, bgra) Super(hMonitor, ClampWidth(width), ClampHeight(height), bits, refreshHz, fullscreen, bgra)
{ {
// To do: this needs to cooperate with the same static in OpenGLFrameBuffer::InitializeState // To do: this needs to cooperate with the same static in OpenGLFrameBuffer::InitializeState
static bool first = true; static bool first = true;
@ -1200,8 +1209,8 @@ void OpenGLSWFrameBuffer::Flip()
if (Windowed) if (Windowed)
{ {
int clientWidth = GetClientWidth(); int clientWidth = ClampWidth(GetClientWidth());
int clientHeight = GetClientHeight(); int clientHeight = ClampHeight(GetClientHeight());
if (clientWidth > 0 && clientHeight > 0 && (Width != clientWidth || Height != clientHeight)) if (clientWidth > 0 && clientHeight > 0 && (Width != clientWidth || Height != clientHeight))
{ {
Resize(clientWidth, clientHeight); Resize(clientWidth, clientHeight);