From df1ef003a61440fe0866433cd117434470a7fbaa Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Fri, 13 Nov 2026 12:20:30 +0000 Subject: [PATCH] Fix D3D12EventNode memory leak of D3D12RenderState - Delete state in copy assignment operator - Added a move assignment operator - Replays with EI containing state changes would have leaked memory --- renderdoc/driver/d3d12/d3d12_commands.h | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_commands.h b/renderdoc/driver/d3d12/d3d12_commands.h index 3c4ad2891..fa30a392f 100644 --- a/renderdoc/driver/d3d12/d3d12_commands.h +++ b/renderdoc/driver/d3d12/d3d12_commands.h @@ -50,11 +50,28 @@ struct D3D12EventNode { event = a.event; action = a.action; + SAFE_DELETE(state); if(a.state) - { - state = new D3D12RenderState(); - *state = *a.state; - } + state = new D3D12RenderState(*a.state); + executeData = a.executeData; + resourceUsage = a.resourceUsage; + debugMessages = a.debugMessages; + annotations = a.annotations; + cmdListID = a.cmdListID; + primaryCmdId = a.primaryCmdId; + childCmdBufId = a.childCmdBufId; + addActionUse = a.addActionUse; + addPrimaryExecute = a.addPrimaryExecute; + hasExecuteData = a.hasExecuteData; + return *this; + } + D3D12EventNode &operator=(D3D12EventNode &&a) + { + event = a.event; + action = a.action; + SAFE_DELETE(state); + state = a.state; + a.state = NULL; executeData = a.executeData; resourceUsage = a.resourceUsage; debugMessages = a.debugMessages;