Merge remote-tracking branch 'origin/master' into polybackend

This commit is contained in:
Magnus Norddahl 2019-05-24 19:21:36 +02:00
commit 4fd4bfa092
21 changed files with 169 additions and 105 deletions

View file

@ -142,7 +142,7 @@ void I_InitGraphics ()
{
Video = new Win32VulkanVideo();
}
catch (CRecoverableError &error)
catch (CVulkanError &error)
{
Printf(TEXTCOLOR_RED "Initialization of Vulkan failed: %s\n", error.what());
Video = new Win32GLVideo();