OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom into vulkan2

Browse source 
# Conflicts:
#	src/posix/sdl/gl_sysfb.h
This commit is contained in:
Rachael Alexanderson 2019-03-31 03:49:08 -04:00
commit ead3695844
24 changed files with 52 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/v_framebuffer.cpp
View file

@ -216,8 +216,8 @@ void DFrameBuffer::Update()
int initialHeight = GetClientHeight();
int clientWidth = ViewportScaledWidth(initialWidth, initialHeight);
int clientHeight = ViewportScaledHeight(initialWidth, initialHeight);
if (clientWidth < 320) clientWidth = 320;
if (clientHeight < 200) clientHeight = 200;
if (clientWidth < 640) clientWidth = 640;
if (clientHeight < 400) clientHeight = 400;
if (clientWidth > 0 && clientHeight > 0 && (GetWidth() != clientWidth || GetHeight() != clientHeight))
{
SetVirtualSize(clientWidth, clientHeight);