From 72966f9ba0fc2f6f724ba8f15e7df64627ae13c2 Mon Sep 17 00:00:00 2001 From: MJP Date: Wed, 7 Jan 2026 17:48:42 -0800 Subject: [PATCH] Add proper casts when returning the wrapped command queue --- renderdoc/driver/d3d12/d3d12_device_wrap.cpp | 5 ++++- renderdoc/driver/d3d12/d3d12_device_wrap9.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/d3d12/d3d12_device_wrap.cpp b/renderdoc/driver/d3d12/d3d12_device_wrap.cpp index 4332337b5..84293cf77 100644 --- a/renderdoc/driver/d3d12/d3d12_device_wrap.cpp +++ b/renderdoc/driver/d3d12/d3d12_device_wrap.cpp @@ -216,7 +216,10 @@ HRESULT WrappedID3D12Device::CreateCommandQueue(const D3D12_COMMAND_QUEUE_DESC * wrapped->GetCreationRecord()->GetResourceID(), eFrameRef_Read); } - *ppCommandQueue = (ID3D12CommandQueue *)wrapped; + if(riid == __uuidof(ID3D12CommandQueue)) + *ppCommandQueue = (ID3D12CommandQueue *)wrapped; + else if(riid == __uuidof(ID3D12CommandQueue1)) + *ppCommandQueue = (ID3D12CommandQueue1 *)wrapped; } else { diff --git a/renderdoc/driver/d3d12/d3d12_device_wrap9.cpp b/renderdoc/driver/d3d12/d3d12_device_wrap9.cpp index d72769e9a..747bad815 100644 --- a/renderdoc/driver/d3d12/d3d12_device_wrap9.cpp +++ b/renderdoc/driver/d3d12/d3d12_device_wrap9.cpp @@ -200,7 +200,10 @@ HRESULT WrappedID3D12Device::CreateCommandQueue1(const D3D12_COMMAND_QUEUE_DESC wrapped->GetCreationRecord()->GetResourceID(), eFrameRef_Read); } - *ppCommandQueue = (ID3D12CommandQueue *)wrapped; + if(riid == __uuidof(ID3D12CommandQueue)) + *ppCommandQueue = (ID3D12CommandQueue *)wrapped; + else if(riid == __uuidof(ID3D12CommandQueue1)) + *ppCommandQueue = (ID3D12CommandQueue1 *)wrapped; } else {