zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-18 22:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- don't let the video scale let the screen end up with a client size less than 320x200, which may cause undefined behavior and trigger asserts in debug builds.

Browse source 
# Conflicts:
#	src/gl/system/gl_framebuffer.cpp
#	src/v_video.cpp
This commit is contained in:
Christoph Oelckers 2018-07-22 11:40:12 +02:00 committed by drfrag666
parent 75a8c4da3e
commit 6f322940fe
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gl/system/gl_framebuffer.cpp
View file

@ -179,6 +179,8 @@ void OpenGLFrameBuffer::Update()
int initialHeight = IsFullscreen() ? VideoHeight : GetClientHeight();
int clientWidth = ViewportScaledWidth(initialWidth, initialHeight);
int clientHeight = ViewportScaledHeight(initialWidth, initialHeight);
if (clientWidth < 320) clientWidth = 320;
if (clientHeight < 200) clientHeight = 200;
if (clientWidth > 0 && clientHeight > 0 && (Width != clientWidth || Height != clientHeight))
{
// Do not call Resize here because it's only for software canvases

3
src/v_video.cpp
View file

@ -1315,8 +1315,7 @@ void V_UpdateModeSize (int width, int height)
CleanWidth = width / CleanXfac;
CleanHeight = height / CleanYfac;
assert(CleanWidth >= 320);
assert(CleanHeight >= 200);
assert(CleanWidth >= 320 && CleanHeight >= 200);
if (width < 800 || width >= 960)
{