id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-14 06:34:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix NVRHI device shutdown for SDL and do additional resource cleanup on exit

Browse source
This commit is contained in:
Stephen Saunders 2022-10-28 14:11:10 -04:00
parent 8219860378
commit 9734df5f01
5 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/renderer/ImageManager.cpp
View file

@ -785,7 +785,7 @@ void idImageManager::Shutdown()
deferredImages.DeleteContents( true );
deferredImageHash.Clear();
#if defined( USE_NVRHI )
commandList = nullptr;
commandList.Reset();
#endif
}

3
neo/renderer/ModelManager.cpp
View file

@ -286,6 +286,9 @@ void idRenderModelManagerLocal::Shutdown()
{
models.DeleteContents( true );
hash.Free();
#if defined( USE_NVRHI )
commandList.Reset();
#endif
}
/*

4
neo/renderer/RenderSystem_init.cpp
View file

@ -2284,6 +2284,10 @@ void idRenderSystemLocal::Shutdown()
Clear();
#if defined( USE_NVRHI )
commandList.Reset();
#endif
ShutdownOpenGL();
bInitialized = false;

14
neo/sys/sdl/DeviceManager_VK.cpp
View file

@ -1083,6 +1083,20 @@ void DeviceManager_VK::DestroyDeviceAndSwapChain()
m_BarrierCommandList = nullptr;
while( m_FramesInFlight.size() > 0 )
{
auto query = m_FramesInFlight.front();
m_FramesInFlight.pop();
query = nullptr;
}
if( !m_QueryPool.empty() )
{
auto query = m_QueryPool.back();
m_QueryPool.pop_back();
query = nullptr;
}
m_NvrhiDevice = nullptr;
m_ValidationLayer = nullptr;
m_RendererString.clear();

13
neo/sys/sdl/sdl_vkimp.cpp
View file

@ -534,12 +534,6 @@ bool VKimp_SetScreenParms( glimpParms_t parms )
void DeviceManager::Shutdown()
{
DestroyDeviceAndSwapChain();
// destroy window
VKimp_Shutdown();
// restore gamma
//VKimp_RestoreGamma();
}
#endif
@ -552,6 +546,13 @@ void VKimp_Shutdown()
{
common->Printf( "Shutting down Vulkan subsystem\n" );
#if defined( USE_NVRHI )
if( deviceManager )
{
deviceManager->Shutdown();
}
#endif
if( window )
{
SDL_DestroyWindow( window );