rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-21 22:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Fix crash if device is freed with bound textures

Browse Source
This commit is contained in:
Alpyne 2023-05-07 21:49:23 -07:00 committed by Joshie
parent bef2ef69ab
commit 2b09932d51
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/d3d9/d3d9_device.h
View File

@ -1358,8 +1358,6 @@ namespace dxvk {
std::atomic<int64_t> m_availableMemory = { 0 }; std::atomic<int64_t> m_availableMemory = { 0 };
std::atomic<int32_t> m_samplerCount = { 0 }; std::atomic<int32_t> m_samplerCount = { 0 };
Direct3DState9 m_state;
D3D9DeviceLostState m_deviceLostState = D3D9DeviceLostState::Ok; D3D9DeviceLostState m_deviceLostState = D3D9DeviceLostState::Ok;
HWND m_fullscreenWindow = NULL; HWND m_fullscreenWindow = NULL;
@ -1367,6 +1365,10 @@ namespace dxvk {
lru_list<D3D9CommonTexture*> m_mappedTextures; lru_list<D3D9CommonTexture*> m_mappedTextures;
#endif #endif
// m_state should be declared last (i.e. freed first), because it
// references objects that can call back into the device when freed.
Direct3DState9 m_state;
D3D9VkInteropDevice m_d3d9Interop; D3D9VkInteropDevice m_d3d9Interop;
}; };